hwinfo in den Installer gebracht.

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

diff --git a/lfs/zlib b/lfs/zlib
index 9a72a410a19d19e853d760ba98c84195706d5e01..6f8b00bc0570883cd3086e7220708c4f65cd8cd8 100644 (file)
--- a/lfs/zlib
+++ b/lfs/zlib
@@ -32,7 +32,11 @@ THISAPP    = zlib-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+ifeq "$(LFS_PASS)" "install"
+  TARGET     = $(DIR_INFO)/$(THISAPP)-install
+else
+  TARGET     = $(DIR_INFO)/$(THISAPP)
+endif
 CFLAGS    += -fPIC
 
 ###############################################################################
@@ -72,6 +76,12 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ifeq "$(LFS_PASS)" "install"
+       cd $(DIR_APP) && ./configure --prefix=/opt/$(MACHINE)-uClibc    
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       chmod -v 644 /opt/$(MACHINE)-uClibc/lib/libz.a
+else
        cd $(DIR_APP) && ./configure --prefix=/usr --shared --libdir=/lib
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
@@ -82,5 +92,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        chmod -v 644 /usr/lib/libz.a
+endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)