Made a preconfigured zlib package.

diff --git a/lfs/zlib b/lfs/zlib
index 6f4388dfb7212cb2f2f7d5c0e795e52cee9d1d63..134a842a98ff7774ec98dff730bb6458597c2e58 100644 (file)
--- a/lfs/zlib
+++ b/lfs/zlib
@@ -28,7 +28,7 @@ PKG_NAME   = zlib
 VER        = 1.2.3
 
 THISAPP    = $(PKG_NAME)-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP)-autotools-1.tar.gz
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
@@ -39,7 +39,8 @@ CFLAGS    += -fPIC
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) $(THISAPP)-autotools.patch
+objects = $(DL_FILE) \
+       $(THISAPP)-autotools.patch
 
 install : $(TARGET)
 
@@ -55,8 +56,8 @@ $(objects) :
 $(TARGET) : 
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-autotools.patch
-       cd $(DIR_APP) && autoreconf --install
+       #cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-autotools.patch
+       #cd $(DIR_APP) && autoreconf --install
        cd $(DIR_APP) && ./configure --prefix=/usr --libdir=/lib --disable-static
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install

diff --git a/make.sh b/make.sh
index 946b05bc49b20689877a2d681235909062399b10..b4aca1bfc8e35f2706ae62651f1e035024106796 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -121,8 +121,6 @@ base_build() {
        ipfire_make ncurses
        ipfire_make procps
        ipfire_make libtool
-       ipfire_make autoconf
-       ipfire_make automake
        ipfire_make zlib
        ipfire_make perl
        ipfire_make readline
@@ -132,6 +130,8 @@ base_build() {
        ipfire_make attr
        ipfire_make libcap2
        ipfire_make paxctl
+       ipfire_make autoconf
+       ipfire_make automake
        ipfire_make bash
        ipfire_make bzip2
        ipfire_make diffutils