Zwischencommit beim Umzug auf LFS 6.2.

[people/pmueller/ipfire-2.x.git] / lfs / zlib

diff --git a/lfs/zlib b/lfs/zlib
index b202aa1a8e3d863d6aef48c485fa357a40543e54..9a72a410a19d19e853d760ba98c84195706d5e01 100644 (file)
--- a/lfs/zlib
+++ b/lfs/zlib
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: zlib,v 1.4.2.8 2005/07/26 06:27:49 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 1.2.3
 
 THISAPP    = zlib-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_SFNET)/libpng
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 CFLAGS    += -fPIC
@@ -79,11 +73,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr --shared --libdir=/lib
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
+       rm -v /lib/libz.so
+       ln -sfv ../../lib/libz.so.1.2.3 /usr/lib/libz.so
        cd $(DIR_APP) && make clean
        cd $(DIR_APP) && ./configure --prefix=/usr
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
+       chmod -v 644 /usr/lib/libz.a
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)