]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
Because of the fact that syslog-ng depends on glib, we
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 6 Dec 2008 11:23:27 +0000 (12:23 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 6 Dec 2008 11:23:27 +0000 (12:23 +0100)
have to install it in /lib and not in /usr/lib (see LSB).

lfs/glib
make.sh

index b2e6107747aae7c0b6d4ba888df1eb5a092dbc03..9aea0bac81a150f9e84184c26d1a8bd3faa028cd 100644 (file)
--- 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 6536745dccefae5201902e67c40ea2812455dca5..44836aac7d02ef9b8612b8980e7368c207497d64 100755 (executable)
--- 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