From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 6 Dec 2008 11:23:27 +0000 (+0100)
Subject: Because of the fact that syslog-ng depends on glib, we
X-Git-Tag: v3.0-alpha1~409
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f72d423c9c4f8ef6f3290a3bb2ceebdb4fde4e0;p=ipfire-3.x.git

Because of the fact that syslog-ng depends on glib, we
have to install it in /lib and not in /usr/lib (see LSB).
---

diff --git a/lfs/glib b/lfs/glib
index b2e610774..9aea0bac8 100644
--- a/lfs/glib
+++ b/lfs/glib
@@ -53,7 +53,7 @@ $(objects) :
 $(OBJECT) : 
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && ./configure --prefix=/usr --libdir=/lib
 	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 	cd $(DIR_APP) && make install
 	cp -vf $(DIR_CONFIG)/$(PKG_NAME)/glib2-locale.sh /etc/profile.d/
diff --git a/make.sh b/make.sh
index 6536745dc..44836aac7 100755
--- a/make.sh
+++ b/make.sh
@@ -140,6 +140,7 @@ base_build() {
 	ipfire_make gmp
 	ipfire_make grub
 	ipfire_make gawk
+	ipfire_make glib
 	ipfire_make grep
 	ipfire_make groff
 	ipfire_make gzip
@@ -190,7 +191,6 @@ ipfire_build() {
 	ipfire_make pkg-config
 	ipfire_make pcre
 	ipfire_make expat
-	ipfire_make glib
 	ipfire_make dbus
 	ipfire_make dbus-glib
 	ipfire_make openssl