r1574 - in glibc-package/branches/glibc-2.4/debian: debhelper.in rules.d
Author: aurel32
Date: 2006-05-29 07:13:06 +0000 (Mon, 29 May 2006)
New Revision: 1574
Modified:
glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.install
glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
Log:
Fixes for the new ld.so.conf.d support
Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.install
===================================================================
--- glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.install 2006-05-29 06:05:44 UTC (rev 1573)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.install 2006-05-29 07:13:06 UTC (rev 1574)
@@ -21,8 +21,9 @@
debian/local/usr_sbin/tzconfig usr/sbin
-debian/tmp-libc/lib/ldconfig/* lib/ldconfig
debian/tmp-libc/lib/*-*-gnu/ lib
debian/tmp-libc/usr/lib/*-*-gnu/ usr/lib
+debian/tmp-libc/etc/ld.so.conf.d /etc
+
log-test-*-libc usr/share/doc/LIBC
Modified: glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-05-29 06:05:44 UTC (rev 1573)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-05-29 07:13:06 UTC (rev 1574)
@@ -154,8 +154,8 @@
os=`sed '/^ *config-os *=/!d;s/.*= *//g' $(DEB_BUILDDIR)/config.make`; \
triplet='$$machine-$$os'; \
mkdir -p debian/tmp-$(curpass)/lib/$$triplet debian/tmp-$(curpass)/usr/lib/$$triplet; \
- conffile='debian/tmp-$(curpass)/etc/ld.so.conf.d/$$triplet'; \
- echo "# Multiarch support\n" > $$conffile; \
+ conffile="debian/tmp-$(curpass)/etc/ld.so.conf.d/$$triplet"; \
+ echo "# Multiarch support" > $$conffile; \
echo /lib/$$machine-$$os >> $$conffile; \
echo /usr/lib/$$machine-$$os >> $$conffile; \
fi
Reply to: