From bad28062d626c7586328b28af39efb49cf88ba6d Mon Sep 17 00:00:00 2001 From: Ivan Zakharyaschev <imz@altlinux.org> Date: Thu, 31 Jan 2019 16:28:27 +0300 Subject: [PATCH] platform.in: completely expand %%_libsuff (/usr/lib%%nil was ugly) --- installplatform | 5 +++-- platform.in | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/installplatform b/installplatform index 4696f91..c9140c4 100755 --- a/installplatform +++ b/installplatform @@ -94,7 +94,7 @@ for SUBST in $SUBSTS ; do ARCH=`echo $arch | sed -e $SUBST` TARGET_PLATFORM=`echo $target_platform | sed -e $SUBST` TARGET=`echo $target | sed -e $SUBST` - LIBSUFF='%nil' + LIBSUFF= PPD="${DESTDIR}/${pkglibdir}/${ARCH}-${VENDOR}-${OS}" @@ -138,12 +138,13 @@ for SUBST in $SUBSTS ; do esac LIBSUFF_EXISTS=@ - [ "$LIBSUFF" = '%nil' ] || LIBSUFF_EXISTS= + [ "$LIBSUFF" = '' ] || LIBSUFF_EXISTS= cat $PLATFORM \ | sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \ -e "s,@RPMRC_ARCH@,$ARCH," \ -e "s,@RPMRC_GNU@,$RPMRC_GNU," \ + -e "s,@LIBSUFF_DEFINITION@,${LIBSUFF:-%nil}," \ -e "s,@LIBSUFF@,$LIBSUFF," \ -e "s,@LIBSUFF_EXISTS@,$LIBSUFF_EXISTS," \ -e "s,@ARCH_INSTALL_POST@,$ARCH_INSTALL_POST," \ diff --git a/platform.in b/platform.in index dbdd921..fa30328 100644 --- a/platform.in +++ b/platform.in @@ -23,7 +23,7 @@ %_sysconfdir @sysconfdir@ %_sharedstatedir %{_var}/lib %_localstatedir @localstatedir@ -%_libsuff @LIBSUFF@ +%_libsuff @LIBSUFF_DEFINITION@ @LIBSUFF_EXISTS@%_is_libsuff 1 %_lib lib@LIBSUFF@ %_libdir @prefix@/lib@LIBSUFF@