platform.in: completely expand %%_libsuff (/usr/lib%%nil was ugly)

This commit is contained in:
Ivan Zakharyaschev 2019-01-31 16:28:27 +03:00 committed by Gleb Fotengauer-Malinovskiy
parent 48bd55e50d
commit bad28062d6
2 changed files with 4 additions and 3 deletions

View File

@ -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," \

View File

@ -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@