From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 1 Jun 2010 16:40:52 +0000 (+0200)
Subject: glibc: Install /etc/ld.so.conf.d.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=647b4a94a88a68d71b7d75a91aa0a4db49134ae6;p=ipfire-3.x.git

glibc: Install /etc/ld.so.conf.d.
---

diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/core/glibc/glibc.nm
index 6f4b17789..ef2d2ddff 100644
--- a/pkgs/core/glibc/glibc.nm
+++ b/pkgs/core/glibc/glibc.nm
@@ -266,4 +266,5 @@ define STAGE_INSTALL
 
 	# Configuration
 	cp -vf $(DIR_SOURCE)/{ld.so.conf,nsswitch.conf} $(BUILDROOT)/etc
+	-mkdir -pv $(BUILDROOT)/etc/ld.so.conf.d
 endef
diff --git a/pkgs/core/glibc/ld.so.conf b/pkgs/core/glibc/ld.so.conf
index c6b8205b1..4de8ad951 100644
--- a/pkgs/core/glibc/ld.so.conf
+++ b/pkgs/core/glibc/ld.so.conf
@@ -1,4 +1,5 @@
 # Begin /etc/ld.so.conf
-/usr/lib/sasl2
-/usr/local/lib
+
+include ld.so.conf.d/*.conf
+
 # End /etc/ld.so.conf