From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 14 Mar 2009 17:04:45 +0000 (+0100)
Subject: Fixed linking of libs.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91ff9662fca99dd093c4199d454f4f4f968f0149;p=ipfire-3.x.git

Fixed linking of libs.
---

diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs
index 1cfc1384b..2ad0986e4 100644
--- a/lfs/e2fsprogs
+++ b/lfs/e2fsprogs
@@ -113,6 +113,12 @@ ifeq "$(STAGE)" "base"
 	cd $(DIR_APP)/build && make $(PARALLELISMFLAGS)
 	cd $(DIR_APP)/build && make install
 	cd $(DIR_APP)/build && make install-libs
+	ln -svf ../../lib/libblkid.so.1 /usr/lib/libblkid.so
+	ln -svf ../../lib/libcom_err.so.2 /usr/lib/libcom_err.so
+	ln -svf ../../lib/libe2p.so.2 /usr/lib/libe2p.so
+	ln -svf ../../lib/libext2fs.so.2 /usr/lib/libext2fs.so
+	ln -svf ../../lib/libss.so.2 /usr/lib/libss.so
+	ln -svf ../../lib/libuuid.so.1 /usr/lib/libuuid.so
 endif
 
 	@rm -rf $(DIR_APP)
diff --git a/lfs/samba b/lfs/samba
index 149a551c3..3cdaca6de 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -114,9 +114,9 @@ $(OBJECT): $(objects)
 	cd $(DIR_APP)/source && make install
 
 	cd $(DIR_APP) && install -m 755 source/nsswitch/libnss_winbind.so /lib/libnss_winbind.so.2
-	ln -sf /lib/libnss_winbind.so.2  /usr/lib/libnss_winbind.so
+	ln -sf ../../lib/libnss_winbind.so.2  /usr/lib/libnss_winbind.so
 	cd $(DIR_APP) && install -m 755 source/nsswitch/libnss_wins.so /lib/libnss_wins.so.2
-	ln -sf /lib/libnss_wins.so.2 /usr/lib/libnss_wins.so
+	ln -sf ../../lib/libnss_wins.so.2 /usr/lib/libnss_wins.so
 	-mkdir -pv /etc/samba
 	echo "127.0.0.1 localhost" > /etc/samba/lmhosts
 	@rm -rf $(DIR_APP)