r337 - in x86/trunk: . packages/zlib

justin at linuxfromscratch.org justin at linuxfromscratch.org
Sun Jul 10 22:17:34 PDT 2005


Author: justin
Date: 2005-07-10 23:17:34 -0600 (Sun, 10 Jul 2005)
New Revision: 337

Modified:
   x86/trunk/Makefile
   x86/trunk/packages/zlib/Makefile
Log:
Merged r324, r325, r326, r327, r328 from 6.1 to trunk.

Modified: x86/trunk/Makefile
===================================================================
--- x86/trunk/Makefile	2005-07-11 05:04:31 UTC (rev 336)
+++ x86/trunk/Makefile	2005-07-11 05:17:34 UTC (rev 337)
@@ -30,7 +30,7 @@
 export HTTP := http://ftp.lfs-matrix.net/pub/lfs/lfs-packages/conglomeration
 
 # Don't edit these!
-export VERSION=x86-6.1-1-rc1
+export VERSION=x86-6.1-1
 export HOSTNAME := lfslivecd
 export WD := /tools
 export SRC := /sources

Modified: x86/trunk/packages/zlib/Makefile
===================================================================
--- x86/trunk/packages/zlib/Makefile	2005-07-11 05:04:31 UTC (rev 336)
+++ x86/trunk/packages/zlib/Makefile	2005-07-11 05:17:34 UTC (rev 337)
@@ -27,10 +27,10 @@
 	@if [ ! -f /usr/lib/libz.so ] ; then unpack $(SRC)/$(FILE) && \
 	 cd $(DIR) && patch -Np1 -i $(SRC)/$(PATCH1) && \
 	 ./configure --prefix=/usr --shared --libdir=/lib && \
-	 make -j3 && make install && make clean && ./configure --prefix=/usr && \
-	 make -j3 && make install && chmod 644 /usr/lib/libz.a && \
-	 mv /usr/lib/libz.so.* /lib && \
-	 ln -sf ../../lib/libz.so.1 /usr/lib/libz.so ; fi
+	 make -j3 && make install && \
+	 rm /lib/libz.so && ln -sf ../../lib/libz.so.1.2.2 /usr/lib/libz.so && \
+	 make clean && ./configure --prefix=/usr && \
+	 make -j3 && make install && chmod 644 /usr/lib/libz.a ; fi
 	@make clean
 	 
 




More information about the livecd mailing list