From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 6 Dec 2008 17:12:16 +0000 (+0100)
Subject: Fixed commit d45c6de8acb13a9fe71bed5e59df3d44fe62b7aa.
X-Git-Tag: v3.0-alpha1~405
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17628feed3397106fc8d703117d58f8f7ea9e40a;p=ipfire-3.x.git

Fixed commit d45c6de8acb13a9fe71bed5e59df3d44fe62b7aa.
---

diff --git a/lfs/glib b/lfs/glib
index 9aea0bac8..860a9b3e0 100644
--- a/lfs/glib
+++ b/lfs/glib
@@ -53,9 +53,14 @@ $(objects) :
 $(OBJECT) : 
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --libdir=/lib
+	cd $(DIR_APP) && ./configure --prefix=/usr
 	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 	cd $(DIR_APP) && make install
+	cd $(DIR_APP) && ./mkinstalldirs /lib
+	cd /usr/lib   && for name in glib gobject gmodule gthread gio; do \
+		mv -v lib$${name}-2.0.so.* ../../lib; \
+		ln -svf ../../lib/lib$${name}-2.0.so.*.* lib$${name}-2.0.so; \
+	done
 	cp -vf $(DIR_CONFIG)/$(PKG_NAME)/glib2-locale.sh /etc/profile.d/
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)