[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r1614 - glibc-package/branches/glibc-2.4/debian/rules.d



Author: barbier
Date: 2006-06-02 23:01:24 +0000 (Fri, 02 Jun 2006)
New Revision: 1614

Modified:
   glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
Log:
Add a .conf suffix to files in /etc/ld.so.conf.d/


Modified: glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/build.mk	2006-06-02 22:38:28 UTC (rev 1613)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/build.mk	2006-06-02 23:01:24 UTC (rev 1614)
@@ -154,10 +154,10 @@
 	  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"; \
+	  conffile="debian/tmp-$(curpass)/etc/ld.so.conf.d/$$triplet.conf"; \
 	  echo "# Multiarch support" > $$conffile; \
-	  echo /lib/$$machine-$$os >> $$conffile; \
-	  echo /usr/lib/$$machine-$$os >> $$conffile; \
+	  echo /lib/$$triplet >> $$conffile; \
+	  echo /usr/lib/$$triplet >> $$conffile; \
 	fi
 	 
 	$(call xx,extra_install)



Reply to: