[Lunar-commits] <moonbase> zlib: install the shared lib in /lib instead of /usr/lib/ kmod need this for gzip compressed modules.

[Florin Braescu]

commit 044b6bbb6b0a19951067b47229ac9a54e213320c
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Sun Jan 22 15:28:10 2012 +0100

    zlib: install the shared lib in /lib instead of /usr/lib/ kmod need this for gzip compressed modules.
---
 archive/zlib/BUILD        |    8 ++++++--
 archive/zlib/BUILD.x86_64 |   16 +++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/archive/zlib/BUILD b/archive/zlib/BUILD
index a4392fc..1e36a7a 100644
--- a/archive/zlib/BUILD
+++ b/archive/zlib/BUILD
@@ -1,20 +1,24 @@
 (
 
+  sedit "s:\${libdir}/pkgconfig:/usr/lib/pkgconfig:" Makefile.in  &&
+
   patch_it $SOURCE2 1         &&
   ./configure  --prefix=/usr  &&
   make                        &&
 
   ./configure  --prefix=/usr  \
+               --libdir=/lib  \
                --shared       &&
 
   # This fixes a bug in zlib's configure script that fails to set
   # CFLAGS properly when CFLAGS is passed to it and --shared is set
   if [ "`arch`" = "alpha" ]; then
       sedit 's/^CFLAGS *=/CFLAGS=-fPIC /' Makefile
-  fi                  &&
+  fi  &&
 
-  default_make        &&  
+  default_make  &&
   cp libz.a /usr/lib  &&
+  rm /lib/libz.a      &&
   chmod 755 /usr/lib/libz.a
 
 ) > $C_FIFO 2>&1
diff --git a/archive/zlib/BUILD.x86_64 b/archive/zlib/BUILD.x86_64
index 764593b..950ffdf 100644
--- a/archive/zlib/BUILD.x86_64
+++ b/archive/zlib/BUILD.x86_64
@@ -1,18 +1,20 @@
 (
 
+  sedit "s:\${libdir}/pkgconfig:/usr/lib/pkgconfig:" Makefile.in  &&
+
   patch_it $SOURCE2 1 &&
   unset CFLAGS &&
 
   prepare_install &&
 
-  ./configure --prefix=/usr &&
-  sedit 's/^CFLAGS *=/CFLAGS=-fPIC /' Makefile &&
-  make &&
-  make install &&
+  ./configure --prefix=/usr  &&
+  sedit 's/^CFLAGS *=/CFLAGS=-fPIC /' Makefile  &&
+  make  &&
+  make install  &&
 
-  ./configure --prefix=/usr --shared &&
-  sedit 's/^CFLAGS *=/CFLAGS=-fPIC /' Makefile &&
-  make &&
+  ./configure --prefix=/usr --libdir=/lib --shared  &&
+  sedit 's/^CFLAGS *=/CFLAGS=-fPIC /' Makefile  &&
+  make  &&
   make install
 
 ) > $C_FIFO 2>&1