[Lunar-commits] CVS: moonbase/archive/zlib BUILD,1.6,1.7

[Jerry Lundström]

Update of /var/cvs/lunar/moonbase/archive/zlib
In directory dbguin.lunar-linux.org:/tmp/cvs-serv16303

Modified Files:
	BUILD 
Log Message:
cleaner build for zlib

Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/archive/zlib/BUILD,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- BUILD	5 Dec 2003 17:32:58 -0000	1.6
+++ BUILD	10 Aug 2004 07:49:05 -0000	1.7
@@ -1,18 +1,20 @@
 (
-  sedit  "s/-O/$CFLAGS/"  Makefile
+  ./configure  --prefix=/usr  &&
+  make                        &&
 
   ./configure  --prefix=/usr  \
                --shared       &&
-  if [ "`arch`" == "alpha" ]; then
-# 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
-      sedit "s/CFLAGS=/CFLAGS=-fPIC /" Makefile;
+
+  # 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                          &&
+
   make                        &&
   prepare_install             &&
   make    install             &&
-  ./configure  --prefix=/usr  &&
-  make                        &&
-  make    install
+  cp libz.a /usr/lib          &&
+  chmod 755 /usr/lib/libz.a
 
 ) > $C_FIFO 2>&1