Author: aurel32 Date: 2009-09-07 19:08:08 +0000 (Mon, 07 Sep 2009) New Revision: 3812
Modified: glibc-package/branches/multiarch/debian/changelog glibc-package/branches/multiarch/debian/rules.d/build.mk Log: * Simplify the creation of /etc/ld.so.conf.d/<triplet>.conf. Modified: glibc-package/branches/multiarch/debian/changelog =================================================================== --- glibc-package/branches/multiarch/debian/changelog 2009-09-07 19:05:08 UTC (rev 3811) +++ glibc-package/branches/multiarch/debian/changelog 2009-09-07 19:08:08 UTC (rev 3812) @@ -1,6 +1,7 @@ eglibc (2.9-27+multiarch) UNRELEASED; urgency=low * Use the multiarch path for the native version and optimized flavors. + * Simplify the creation of /etc/ld.so.conf.d/<triplet>.conf. -- Aurelien Jarno <[email protected]> Mon, 07 Sep 2009 21:04:08 +0200 Modified: glibc-package/branches/multiarch/debian/rules.d/build.mk =================================================================== --- glibc-package/branches/multiarch/debian/rules.d/build.mk 2009-09-07 19:05:08 UTC (rev 3811) +++ glibc-package/branches/multiarch/debian/rules.d/build.mk 2009-09-07 19:08:08 UTC (rev 3812) @@ -141,13 +141,10 @@ # Create the multidir directories, and the configuration file in /etc/ld.so.conf.d if [ $(curpass) = libc ]; then \ mkdir -p debian/tmp-$(curpass)/etc/ld.so.conf.d; \ - machine=`sed '/^ *config-machine *=/!d;s/.*= *//g' $(DEB_BUILDDIR)/config.make`; \ - os=`sed '/^ *config-os *=/!d;s/.*= *//g;s/gnu-gnu/gnu/' $(DEB_BUILDDIR)/config.make`; \ - triplet="$$machine-$$os"; \ - conffile="debian/tmp-$(curpass)/etc/ld.so.conf.d/$$triplet.conf"; \ + conffile="debian/tmp-$(curpass)/etc/ld.so.conf.d/$(DEB_HOST_GNU_TYPE).conf"; \ echo "# Multiarch support" > $$conffile; \ - echo /lib/$$triplet >> $$conffile; \ - echo /usr/lib/$$triplet >> $$conffile; \ + echo /lib/$(DEB_HOST_GNU_TYPE) >> $$conffile; \ + echo /usr/lib/$(DEB_HOST_GNU_TYPE) >> $$conffile; \ fi $(call xx,extra_install) -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
