Author: vorlon
Date: 2011-12-07 00:15:54 +0000 (Wed, 07 Dec 2011)
New Revision: 5054
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/build.mk
Log:
Name our biarch compat ld.so.conf.d files on arm* consistently with the
ones on other archs.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-12-07 00:15:45 UTC (rev 5053)
+++ glibc-package/trunk/debian/changelog 2011-12-07 00:15:54 UTC (rev 5054)
@@ -88,6 +88,8 @@
during an upgrade between releases to ask whether it's ok to restart a
service that will be restarted anyway when the package itself gets
upgraded.
+ * Name our biarch compat ld.so.conf.d files on arm* consistently with the
+ ones on other archs.
-- Samuel Thibault <sthibault@debian.org> Mon, 17 Oct 2011 01:23:52 +0200
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2011-12-07 00:15:45 UTC (rev 5053)
+++ glibc-package/trunk/debian/rules.d/build.mk 2011-12-07 00:15:54 UTC (rev 5054)
@@ -195,7 +195,7 @@
# handle the non-default multilib for arm targets
case $(curpass) in arm*) \
mkdir -p debian/tmp-$(curpass)/etc/ld.so.conf.d; \
- conffile="debian/tmp-$(curpass)/etc/ld.so.conf.d/$$(basename $(call xx,slibdir)).conf"; \
+ conffile="debian/tmp-$(curpass)/etc/ld.so.conf.d/zz_$(curpass)-biarch-compat.conf"; \
echo "# Multiarch support" > $$conffile; \
echo "$(call xx,slibdir)" >> $$conffile; \
echo "$(call xx,libdir)" >> $$conffile; \