From: Michael Tremer Date: Thu, 30 Apr 2009 08:26:48 +0000 (+0200) Subject: Automatically set dependencies in all lfs files. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6d3e43531513d0b763821c079286a280c7747f1;p=ipfire-3.x.git Automatically set dependencies in all lfs files. --- diff --git a/lfs/attr b/lfs/attr index 43e83e7a4..4293eb12f 100644 --- a/lfs/attr +++ b/lfs/attr @@ -74,7 +74,7 @@ $(objects): $(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/cairo b/lfs/cairo index e0ee3a092..6c1ecff1d 100644 --- a/lfs/cairo +++ b/lfs/cairo @@ -72,7 +72,7 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ diff --git a/lfs/ccache b/lfs/ccache index 794217404..a2bcbb43c 100644 --- a/lfs/ccache +++ b/lfs/ccache @@ -78,7 +78,7 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -p0 < $(DIR_PATCHES)/$(THISAPP).patch diff --git a/lfs/images b/lfs/images index b7e61e3a5..3177011eb 100644 --- a/lfs/images +++ b/lfs/images @@ -77,7 +77,7 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @rm -rf $(CDROM_DIR)/* $(CDROM_DIR)/.$(SNAME)info ifeq "$(PASS)" "$(THISAPP)" diff --git a/lfs/initramfs b/lfs/initramfs index d32c3021c..6a771695d 100644 --- a/lfs/initramfs +++ b/lfs/initramfs @@ -54,6 +54,6 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @depmod -a $(KVER) /sbin/mkliveramfs -f -v $(IMAGES_DIR)/$(PKG_NAME)-$(VERSION).img $(KVER) diff --git a/lfs/libjpeg b/lfs/libjpeg index c7120b5b9..9a56364e9 100644 --- a/lfs/libjpeg +++ b/lfs/libjpeg @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/libnetfilter_conntrack b/lfs/libnetfilter_conntrack index a739954be..05647c6e5 100644 --- a/lfs/libnetfilter_conntrack +++ b/lfs/libnetfilter_conntrack @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/libnetfilter_log b/lfs/libnetfilter_log index 398996ba7..600d4d71a 100644 --- a/lfs/libnetfilter_log +++ b/lfs/libnetfilter_log @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/libnetfilter_queue b/lfs/libnetfilter_queue index c57cab0b0..c4b01632d 100644 --- a/lfs/libnetfilter_queue +++ b/lfs/libnetfilter_queue @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/libnfnetlink b/lfs/libnfnetlink index 9c2966931..b0bd14f78 100644 --- a/lfs/libnfnetlink +++ b/lfs/libnfnetlink @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/libpcap b/lfs/libpcap index eee6fd7ab..20d6fa2db 100644 --- a/lfs/libpcap +++ b/lfs/libpcap @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/libpng b/lfs/libpng index 4b30e821c..f326c9538 100644 --- a/lfs/libpng +++ b/lfs/libpng @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/libtiff b/lfs/libtiff index 0f88a0055..a7c34ee95 100644 --- a/lfs/libtiff +++ b/lfs/libtiff @@ -58,9 +58,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/libtool b/lfs/libtool index 28e17bc87..bca9277f3 100644 --- a/lfs/libtool +++ b/lfs/libtool @@ -74,7 +74,7 @@ $(objects) : # Installation Details ############################################################################### -$(OBJECT): $(objects) +$(OBJECT): $(objects) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ diff --git a/lfs/libusb b/lfs/libusb index 1a8570b34..54c6e7e4a 100644 --- a/lfs/libusb +++ b/lfs/libusb @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/libusb-compat b/lfs/libusb-compat index d98f499b0..47b90b132 100644 --- a/lfs/libusb-compat +++ b/lfs/libusb-compat @@ -58,9 +58,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/libuser b/lfs/libuser index c85d2a145..b767a02d6 100644 --- a/lfs/libuser +++ b/lfs/libuser @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/libxml2 b/lfs/libxml2 index 0ece0f983..3dd01ce21 100644 --- a/lfs/libxml2 +++ b/lfs/libxml2 @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/libxslt b/lfs/libxslt index 7f916f3d5..f63eb7f6d 100644 --- a/lfs/libxslt +++ b/lfs/libxslt @@ -58,9 +58,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/lighttpd b/lfs/lighttpd index 8916a61c4..d544b617c 100644 --- a/lfs/lighttpd +++ b/lfs/lighttpd @@ -56,7 +56,7 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) diff --git a/lfs/linux-atm b/lfs/linux-atm index a4c49ba06..776577f80 100644 --- a/lfs/linux-atm +++ b/lfs/linux-atm @@ -58,9 +58,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-gcc-4.patch cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-nmu.diff cd $(DIR_APP) && \ diff --git a/lfs/lm-sensors b/lfs/lm-sensors index 0c1ccf4e8..66fae6a12 100644 --- a/lfs/lm-sensors +++ b/lfs/lm-sensors @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && sed -e "s/^PREFIX\ :=\ .*/PREFIX=\/usr/g" \ -e "s/^MACHINE\ :=\ .*/MACHINE=$(MACHINE)/g" -i Makefile cd $(DIR_APP) && make $(PARALLELISMFLAGS) EXLDFLAGS= diff --git a/lfs/logrotate b/lfs/logrotate index b3dc0ef26..3ac6c2877 100644 --- a/lfs/logrotate +++ b/lfs/logrotate @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install touch /var/lib/logrotate.status diff --git a/lfs/lsof b/lfs/lsof index 1924f65aa..21355f5ad 100644 --- a/lfs/lsof +++ b/lfs/lsof @@ -73,7 +73,7 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : $(objects) +$(OBJECT): $(objects) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./Configure linux -n diff --git a/lfs/lzo b/lfs/lzo index 928a0e346..98c697838 100644 --- a/lfs/lzo +++ b/lfs/lzo @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/m4 b/lfs/m4 index 02c45c32a..b7541808c 100644 --- a/lfs/m4 +++ b/lfs/m4 @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) ifeq "$(STAGE)" "toolchain" # We need -D_GNU_SOURCE because this version of M4 has a bug in gnulib (or diff --git a/lfs/make b/lfs/make index a3f1b51aa..b9c399438 100644 --- a/lfs/make +++ b/lfs/make @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) ifeq "$(STAGE)" "toolchain" cd $(DIR_APP) && \ diff --git a/lfs/man-db b/lfs/man-db index ae6231502..c50b770b9 100644 --- a/lfs/man-db +++ b/lfs/man-db @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && sed -i -e '\%\t/usr/man%d' -e '\%\t/usr/local/man%d' src/man_db.conf.in cd $(DIR_APP) && CC="gcc -std=gnu99 -fgnu89-inline" \ ./configure \ diff --git a/lfs/man-pages b/lfs/man-pages index 84019410d..eaaf2664c 100644 --- a/lfs/man-pages +++ b/lfs/man-pages @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/mc b/lfs/mc index 5e2526571..2bb8c970b 100644 --- a/lfs/mc +++ b/lfs/mc @@ -61,9 +61,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-utf8.patch cd $(DIR_APP) && autoreconf -f -v cd $(DIR_APP) && \ diff --git a/lfs/memtest86+ b/lfs/memtest86+ index 2e58eca12..fbbf4215e 100644 --- a/lfs/memtest86+ +++ b/lfs/memtest86+ @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make $(PARALLELISMFLAGS) CC="gcc -fno-PIE -fno-stack-protector" -mkdir -p /usr/lib/memtest86+ cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+ diff --git a/lfs/mingetty b/lfs/mingetty index c80f66799..89ebe5642 100644 --- a/lfs/mingetty +++ b/lfs/mingetty @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/mkinitramfs b/lfs/mkinitramfs index 6e55cc4bb..c79d0f7ba 100644 --- a/lfs/mkinitramfs +++ b/lfs/mkinitramfs @@ -56,7 +56,7 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) install -m 755 $(DIR_APP)/lsinitramfs /sbin/lsinitramfs install -m 755 $(DIR_APP)/mkinitramfs /sbin/mkinitramfs diff --git a/lfs/module-init-tools b/lfs/module-init-tools index 955b9d387..fa04705f1 100644 --- a/lfs/module-init-tools +++ b/lfs/module-init-tools @@ -80,7 +80,7 @@ $(objects): $(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-nostatic-1.patch cd $(DIR_APP) && autoreconf --force cd $(DIR_APP) && \ diff --git a/lfs/mpfr b/lfs/mpfr index e7b11193c..1867cffcc 100644 --- a/lfs/mpfr +++ b/lfs/mpfr @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ mpfr_cv_working_tls=yes \ ./configure \ diff --git a/lfs/nano b/lfs/nano index f20f2fc44..51835e138 100644 --- a/lfs/nano +++ b/lfs/nano @@ -61,9 +61,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-open-macro.patch cd $(DIR_APP) && \ ./configure \ diff --git a/lfs/nasm b/lfs/nasm index bc7d0177d..25f296428 100644 --- a/lfs/nasm +++ b/lfs/nasm @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/ncurses b/lfs/ncurses index cb4aa154a..ab7ce498b 100644 --- a/lfs/ncurses +++ b/lfs/ncurses @@ -57,9 +57,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) # We need wide character support for the Linux kernel menuconfig. # --enable-symlinks installs the 'tic' program as a symbolic link (why not). diff --git a/lfs/newt b/lfs/newt index b096dd841..030a7d21c 100644 --- a/lfs/newt +++ b/lfs/newt @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ diff --git a/lfs/noip b/lfs/noip index 6e4ebe4f7..42e04c0e2 100644 --- a/lfs/noip +++ b/lfs/noip @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make $(PARALLELISMFLAGS) PREFIX=/usr CONFDIR=/etc cd $(DIR_APP) && cp noip2 /usr/bin/noip2 @rm -rf $(DIR_APP) diff --git a/lfs/nss_ldap b/lfs/nss_ldap index 3d81b505a..396a1f6ab 100644 --- a/lfs/nss_ldap +++ b/lfs/nss_ldap @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ diff --git a/lfs/ntp b/lfs/ntp index ec1bcc5ff..362b29e27 100644 --- a/lfs/ntp +++ b/lfs/ntp @@ -58,9 +58,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/openldap b/lfs/openldap index 5c660d301..7c14d563b 100644 --- a/lfs/openldap +++ b/lfs/openldap @@ -61,9 +61,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-disable_sys_err.patch cd $(DIR_APP) && \ ./configure \ diff --git a/lfs/openssh b/lfs/openssh index 2818cd873..97bf9d388 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -58,9 +58,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) install -v -m700 -d /var/lib/sshd chown -v root:sys /var/lib/sshd cd $(DIR_APP) && \ diff --git a/lfs/openssl b/lfs/openssl index 090d3393c..dd8cbd9e9 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -72,9 +72,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-fix_manpages-1.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-enginesdir.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-no-rpath.patch diff --git a/lfs/pam b/lfs/pam index af98e38b5..9fcf697fc 100644 --- a/lfs/pam +++ b/lfs/pam @@ -58,9 +58,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) ifeq "$(PASS)" "1" cd $(DIR_APP) && \ diff --git a/lfs/pam_ldap b/lfs/pam_ldap index d6ad01197..35833f167 100644 --- a/lfs/pam_ldap +++ b/lfs/pam_ldap @@ -58,9 +58,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ diff --git a/lfs/pango b/lfs/pango index adffa8320..46222263c 100644 --- a/lfs/pango +++ b/lfs/pango @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/parted b/lfs/parted index 5d40ba09e..157558d98 100644 --- a/lfs/parted +++ b/lfs/parted @@ -56,10 +56,10 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) @rm -rf $(DIR_APP) - @cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/patch b/lfs/patch index 43c81440a..4ff57400e 100644 --- a/lfs/patch +++ b/lfs/patch @@ -58,9 +58,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) # Some fixes: cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-fixes-1.patch diff --git a/lfs/paxctl b/lfs/paxctl index 252417280..5587d2a1d 100644 --- a/lfs/paxctl +++ b/lfs/paxctl @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/pciutils b/lfs/pciutils index 82dd14454..089a322fd 100644 --- a/lfs/pciutils +++ b/lfs/pciutils @@ -72,7 +72,7 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT): $(objects) +$(OBJECT): $(objects) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make SHARED=yes OPT=$(CLFLAGS) PREFIX=/usr ZLIB=no $(PARALLELISMFLAGS) diff --git a/lfs/pcre b/lfs/pcre index 4d36b2159..87d85eb30 100644 --- a/lfs/pcre +++ b/lfs/pcre @@ -58,9 +58,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/perl b/lfs/perl index 0444cf8ca..d1fa5be52 100644 --- a/lfs/perl +++ b/lfs/perl @@ -58,9 +58,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_SRC)/perl* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_SRC)/perl* && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) -mkdir -v $(DIR_SRC)/perl-build ifeq "$(STAGE)" "toolchain" diff --git a/lfs/perl-xml-parser b/lfs/perl-xml-parser index e8e709b43..2034ab680 100644 --- a/lfs/perl-xml-parser +++ b/lfs/perl-xml-parser @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && perl Makefile.PL cd $(DIR_APP) && make #$(PARALLELISMFLAGS) cd $(DIR_APP) && make install diff --git a/lfs/pixman b/lfs/pixman index 86b39e220..7fea36d9a 100644 --- a/lfs/pixman +++ b/lfs/pixman @@ -65,9 +65,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/pkg-config b/lfs/pkg-config index e064daa04..ee293e9f6 100644 --- a/lfs/pkg-config +++ b/lfs/pkg-config @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/pomona b/lfs/pomona index 400a9af02..fd05461dd 100644 --- a/lfs/pomona +++ b/lfs/pomona @@ -55,7 +55,7 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) cd $(DIR_APP) && make clean #cd $(DIR_APP) && make -C po update-po diff --git a/lfs/popt b/lfs/popt index 4dfff1123..34c3f4016 100644 --- a/lfs/popt +++ b/lfs/popt @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) #cd $(DIR_APP) && sed -i -e "/*origOptString ==/c 0)" popt.c cd $(DIR_APP) && \ ./configure \ diff --git a/lfs/ppp b/lfs/ppp index 0eca43309..6be205641 100644 --- a/lfs/ppp +++ b/lfs/ppp @@ -58,9 +58,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/procps b/lfs/procps index 9443d772c..dc46e5fa9 100644 --- a/lfs/procps +++ b/lfs/procps @@ -57,9 +57,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-watch_unicode-1.patch cd $(DIR_APP) && make SHARED=1 CFLAGS="$(CFLAGS)" \ W_SHOWFROM=-DW_SHOWFROM $(PARALLELISMFLAGS) diff --git a/lfs/psmisc b/lfs/psmisc index 8a1fcdba2..f7e75ac2e 100644 --- a/lfs/psmisc +++ b/lfs/psmisc @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/pyfire b/lfs/pyfire index 22370cd9a..ad11b8f09 100644 --- a/lfs/pyfire +++ b/lfs/pyfire @@ -55,7 +55,7 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) cd $(DIR_APP) && make install diff --git a/lfs/python b/lfs/python index dc02e98f4..be50e1626 100644 --- a/lfs/python +++ b/lfs/python @@ -57,9 +57,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-gdbm-1.patch cd $(DIR_APP) && OPT="$(CFLAGS)" \ ./configure \ diff --git a/lfs/python-IPy b/lfs/python-IPy index 06061c091..044938ef2 100644 --- a/lfs/python-IPy +++ b/lfs/python-IPy @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT): +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && python setup.py install diff --git a/lfs/python-dbus b/lfs/python-dbus index e752b18bc..9a1cf51e3 100644 --- a/lfs/python-dbus +++ b/lfs/python-dbus @@ -58,9 +58,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT): +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ diff --git a/lfs/python-netfilter_conntrack b/lfs/python-netfilter_conntrack index 54e9b7d58..72aef9e1f 100644 --- a/lfs/python-netfilter_conntrack +++ b/lfs/python-netfilter_conntrack @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT): +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && python setup.py install diff --git a/lfs/python-parted b/lfs/python-parted index 0dd9781ea..e099a0615 100644 --- a/lfs/python-parted +++ b/lfs/python-parted @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT): +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && PYTHONHOME=/usr \ make all install \ diff --git a/lfs/python-urlgrabber b/lfs/python-urlgrabber index f387fcdfb..d4b72843f 100644 --- a/lfs/python-urlgrabber +++ b/lfs/python-urlgrabber @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT): +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && python setup.py install diff --git a/lfs/readline b/lfs/readline index b11fecccb..0e4f12d63 100644 --- a/lfs/readline +++ b/lfs/readline @@ -57,9 +57,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-shlib-1.patch #cd $(DIR_APP) && sed -i '/MV.*old/d' Makefile.in #cd $(DIR_APP) && sed -i '/{OLDSUFF}/c:' support/shlib-install diff --git a/lfs/reiser4progs b/lfs/reiser4progs index 02fed1556..0c4d4b3f5 100644 --- a/lfs/reiser4progs +++ b/lfs/reiser4progs @@ -57,9 +57,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-bad_elif.patch cd $(DIR_APP) && \ ./configure \ diff --git a/lfs/reiserfsprogs b/lfs/reiserfsprogs index 7f23db9ad..d1af62e54 100644 --- a/lfs/reiserfsprogs +++ b/lfs/reiserfsprogs @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure \ $(CONFIGURE_ARCH) \ --prefix=/usr \ diff --git a/lfs/rp-pppoe b/lfs/rp-pppoe index 9294b9900..52d2f4b70 100644 --- a/lfs/rp-pppoe +++ b/lfs/rp-pppoe @@ -57,9 +57,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-iproute2-1.patch cd $(DIR_APP)/src && \ ./configure \ diff --git a/lfs/rrdtool b/lfs/rrdtool index 14b36c114..fcb9ccda7 100644 --- a/lfs/rrdtool +++ b/lfs/rrdtool @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/screen b/lfs/screen index 816263342..1a96f25fa 100644 --- a/lfs/screen +++ b/lfs/screen @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/slang b/lfs/slang index 87c7377a7..d8a088a41 100644 --- a/lfs/slang +++ b/lfs/slang @@ -59,9 +59,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-makefile.patch cd $(DIR_APP) && \ ./configure \ diff --git a/lfs/smartmontools b/lfs/smartmontools index 1a85ab6b2..5a9d03abb 100644 --- a/lfs/smartmontools +++ b/lfs/smartmontools @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/splashy b/lfs/splashy index 616bc5b32..fc8226035 100644 --- a/lfs/splashy +++ b/lfs/splashy @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ diff --git a/lfs/sqlite b/lfs/sqlite index 625ac55f7..db0f31c37 100644 --- a/lfs/sqlite +++ b/lfs/sqlite @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) -mkdir $(DIR_SRC)/sqlite-build cd $(DIR_SRC)/sqlite-build && \ $(DIR_APP)/configure \ diff --git a/lfs/squashfs-tools b/lfs/squashfs-tools index dea98488d..741e950fc 100644 --- a/lfs/squashfs-tools +++ b/lfs/squashfs-tools @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && sed -e "s/^CFLAGS := /& $(CFLAGS) /" -i Makefile cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && install -m 755 mksquashfs /usr/sbin diff --git a/lfs/squid b/lfs/squid index bf7b6d2ab..00cd26371 100644 --- a/lfs/squid +++ b/lfs/squid @@ -59,9 +59,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/strace b/lfs/strace index d12bf8d75..b1cbfa41c 100644 --- a/lfs/strace +++ b/lfs/strace @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/strongswan b/lfs/strongswan index 563b770d4..43c6a53a4 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -75,7 +75,7 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ diff --git a/lfs/sudo b/lfs/sudo index 0c6e39e22..d3f701307 100644 --- a/lfs/sudo +++ b/lfs/sudo @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/sysfsutils b/lfs/sysfsutils index d07512352..e17deccad 100644 --- a/lfs/sysfsutils +++ b/lfs/sysfsutils @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/syslinux b/lfs/syslinux index 85ae03033..9e3340db3 100644 --- a/lfs/syslinux +++ b/lfs/syslinux @@ -60,9 +60,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-nopie.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-nostrip.patch cd $(DIR_APP) && make clean diff --git a/lfs/sysvinit b/lfs/sysvinit index caf23203a..8094e51a4 100644 --- a/lfs/sysvinit +++ b/lfs/sysvinit @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && sed -e 's/libcrypt.a/libcrypt.so/' \ -e 's/utmpdump wall/utmpdump/' \ diff --git a/lfs/texinfo b/lfs/texinfo index 45c0faf91..c6e991acf 100644 --- a/lfs/texinfo +++ b/lfs/texinfo @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) ifeq "$(STAGE)" "toolchain" cd $(DIR_APP) && \ diff --git a/lfs/udev b/lfs/udev index d64ce7beb..afc9ff7ef 100644 --- a/lfs/udev +++ b/lfs/udev @@ -72,7 +72,7 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) diff --git a/lfs/ulogd2 b/lfs/ulogd2 index f48d3cec2..066118d7e 100644 --- a/lfs/ulogd2 +++ b/lfs/ulogd2 @@ -56,7 +56,7 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) #cd $(DIR_APP) && ./autogen.sh diff --git a/lfs/usbutils b/lfs/usbutils index fa29e987d..70837dfc5 100644 --- a/lfs/usbutils +++ b/lfs/usbutils @@ -58,9 +58,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && sed -i 's|DEST=|&/usr/share/|' update-usbids.sh cd $(DIR_APP) && \ ./configure \ diff --git a/lfs/util-linux-ng b/lfs/util-linux-ng index 5efc751a6..3b2a59780 100644 --- a/lfs/util-linux-ng +++ b/lfs/util-linux-ng @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) ifeq "$(STAGE)" "toolchain" # There's a bug with this version of Util-linux-ng and the E2fsprogs version diff --git a/lfs/vim b/lfs/vim index 7ba3a1546..dd087017e 100644 --- a/lfs/vim +++ b/lfs/vim @@ -58,9 +58,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-fixes-4.patch cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-mandir-1.patch cd $(DIR_APP) && echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h diff --git a/lfs/vlan b/lfs/vlan index 127ca5926..02946caad 100644 --- a/lfs/vlan +++ b/lfs/vlan @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make purge vconfig cd $(DIR_APP) && install -c -p -m 0755 vconfig /sbin @rm -rf $(DIR_APP) diff --git a/lfs/which b/lfs/which index 9156f4a17..cbfb24a88 100644 --- a/lfs/which +++ b/lfs/which @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure \ $(CONFIGURE_ARCH) \ diff --git a/lfs/whois b/lfs/whois index aa5b96efb..d0c456474 100644 --- a/lfs/whois +++ b/lfs/whois @@ -56,9 +56,9 @@ $(objects): # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make prefix=/usr install @rm -rf $(DIR_APP) diff --git a/lfs/xfsprogs b/lfs/xfsprogs index e3cbb3935..a0f9cdd10 100644 --- a/lfs/xfsprogs +++ b/lfs/xfsprogs @@ -72,7 +72,7 @@ $(objects) : # Installation Details ############################################################################### -$(OBJECT): $(objects) +$(OBJECT): $(objects) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np2 -i $(DIR_PATCHES)/$(THISAPP)-parallel-build.patch