Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 12ae47c8732ca8bddede5282e3d3aa263d9cec87..fe4852c3a280b9192eb371c20226e0169d737732 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -1,4 +1,4 @@
-== List of softwares used to build IPFire Version: 2.3-rc1 ==
+== List of softwares used to build IPFire Version: 2.3-test ==
 * Archive-Tar-1.29
 * Archive-Zip-1.16
 * BerkeleyDB-0.27

diff --git a/lfs/Archive-Tar b/lfs/Archive-Tar
index 2cce4a88ae330156c721cc1d7ab4c10352dc7b27..eea96992e58b9a0ebf1f8a8981a206e8d471523c 100644 (file)
--- a/lfs/Archive-Tar
+++ b/lfs/Archive-Tar
@@ -75,7 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/Archive-Zip b/lfs/Archive-Zip
index cace42f8c70f2ccc9944d1dcca03636d074275e4..350a13fef9bb50a7198f3793b1f79b9c0acdd95b 100644 (file)
--- a/lfs/Archive-Zip
+++ b/lfs/Archive-Zip
@@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/BerkeleyDB b/lfs/BerkeleyDB
index 153e70ca290b5409b949c01878a5e798166e7e27..48d535fca3a1555e021ed796538f9346aae3cc43 100644 (file)
--- a/lfs/BerkeleyDB
+++ b/lfs/BerkeleyDB
@@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/Compress-Zlib b/lfs/Compress-Zlib
index d0f34850f9c5d2b70016ebbc9e40edf25e86ae7f..93eef1ad3e16e4bcc928698ec198eeb5ac684f0b 100644 (file)
--- a/lfs/Compress-Zlib
+++ b/lfs/Compress-Zlib
@@ -72,7 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && echo -e "BUILD_ZLIB = False\nINCLUDE = /usr/include\nLIB = /lib\nOLD_ZLIB = True\n" > config.in
        cd $(DIR_APP) && perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/Convert-TNEF b/lfs/Convert-TNEF
index 364e3c4fea07f9471d61846f21eb9baea5a4f611..2a91578be42c05be0ff72d34433fff581567505d 100644 (file)
--- a/lfs/Convert-TNEF
+++ b/lfs/Convert-TNEF
@@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/Convert-UUlib b/lfs/Convert-UUlib
index 1fb2c342a2ca3d21ae828f746b99ae9d544285bd..84af6c0cb70aabe18db60ac0e5c499becaa77a64 100644 (file)
--- a/lfs/Convert-UUlib
+++ b/lfs/Convert-UUlib
@@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/Digest b/lfs/Digest
index 51ad0d97db23f6ca389f487c9c07365ffe4cb3f1..568e620cc6b9f102a3e412f85dea9e4f054ec40f 100644 (file)
--- a/lfs/Digest
+++ b/lfs/Digest
@@ -72,7 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && sed -i "s%,'y'%,'n'%" Makefile.PL
        cd $(DIR_APP) && yes 'n' | perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/Digest-HMAC b/lfs/Digest-HMAC
index 4ee505bcce808fb83e65dc3a4889399aa217cfcc..73f37643019706c573130aa6d099484b3133a26d 100644 (file)
--- a/lfs/Digest-HMAC
+++ b/lfs/Digest-HMAC
@@ -72,7 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && sed -i "s%,'y'%,'n'%" Makefile.PL
        cd $(DIR_APP) && yes 'n' | perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/Digest-SHA1 b/lfs/Digest-SHA1
index 302964eb610f37ace15170a89ea469a7350de506..1cbb71cedcf0210a77f3f641442730c696934e58 100644 (file)
--- a/lfs/Digest-SHA1
+++ b/lfs/Digest-SHA1
@@ -72,7 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && sed -i "s%,'y'%,'n'%" Makefile.PL
        cd $(DIR_APP) && yes 'n' | perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/GeoIP b/lfs/GeoIP
index 9b0d26c497994608f4931744c60ec587b8c19772..fe30b430150f0722bddaf856817ea359771e887f 100644 (file)
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -73,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && mkdir -p /usr/local/share/GeoIP && \
                cp -f $(DIR_DL)/GeoIP.dat /usr/local/share/GeoIP/GeoIP.dat

diff --git a/lfs/HTML-Parser b/lfs/HTML-Parser
index 481beb40bd67b5a2d11b8f541b8ba5dc9df02f2c..184c234d23730ce223600e76fbfd6637dce43c35 100644 (file)
--- a/lfs/HTML-Parser
+++ b/lfs/HTML-Parser
@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && yes 'n' | perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/HTML-Tagset b/lfs/HTML-Tagset
index 3b34ae2d288d6faf4b42941cd135355c1741a0c5..ae6ac5a3e0a45c5e2ab81ed5cc3e5a7daeca6b01 100644 (file)
--- a/lfs/HTML-Tagset
+++ b/lfs/HTML-Tagset
@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && yes 'n' | perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/Locale-Country b/lfs/Locale-Country
index d52ba1413622977f9ae5256da4b871465d36b170..b2c1455efe75262191cb2a0cf4584e97ed593321 100644 (file)
--- a/lfs/Locale-Country
+++ b/lfs/Locale-Country
@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/MIME-Tools b/lfs/MIME-Tools
index 337e4ae4990f5265584fd7509c73e636b80d8d75..00f0b40801d79f0e17cb097e5077afcade3fa3a6 100644 (file)
--- a/lfs/MIME-Tools
+++ b/lfs/MIME-Tools
@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/Mail-Tools b/lfs/Mail-Tools
index 1d5ed5eb4c6da0aeddd0a55fb4295a22e450827a..b1ad6c8cef156b39b865019e944f7cb377cd397e 100644 (file)
--- a/lfs/Mail-Tools
+++ b/lfs/Mail-Tools
@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/Net-DNS b/lfs/Net-DNS
index a8b5909239b60984a852a87f5baf67755aad1eac..71bae29fdc3b2dddb73fb069a6f1a9d8615db44e 100644 (file)
--- a/lfs/Net-DNS
+++ b/lfs/Net-DNS
@@ -72,7 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && sed -i "s%,'y'%,'n'%" Makefile.PL
        cd $(DIR_APP) && yes 'n' | perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/Net-IPv4Addr b/lfs/Net-IPv4Addr
index ab8d335e409c479391125b4d88f27645ec990624..d7ab97f3114e75c1bddfc9713618c67ef5093eac 100644 (file)
--- a/lfs/Net-IPv4Addr
+++ b/lfs/Net-IPv4Addr
@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/Net_SSLeay b/lfs/Net_SSLeay
index d40c90611b284a7dc03bfcc001a8bc7e75afb418..5eced1f328604428a810a0cbf881f67b055c3313 100644 (file)
--- a/lfs/Net_SSLeay
+++ b/lfs/Net_SSLeay
@@ -72,7 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && sed -i "s%,'y'%,'n'%" Makefile.PL
        cd $(DIR_APP) && yes 'n' | perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/URI b/lfs/URI
index 63d126e3e3b724f167467ce757fe5a4b42f131fa..1642c8286253a28a8e3232442c4d348e39f200b3 100644 (file)
--- a/lfs/URI
+++ b/lfs/URI
@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && yes 'n' | perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/Unix-Syslog b/lfs/Unix-Syslog
index e36394eb9d6a91b000e90f196356d005dfc8faac..bc6367d8ef4ee5356d4b469cf3a7389f3385e686 100644 (file)
--- a/lfs/Unix-Syslog
+++ b/lfs/Unix-Syslog
@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/XML-Parser b/lfs/XML-Parser
index c15a81cc199f63159a6694d8fb0d002f72c226e6..bbdf3e00da5c865e49abbf718c1e69e1ad80268a 100644 (file)
--- a/lfs/XML-Parser
+++ b/lfs/XML-Parser
@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/alsa b/lfs/alsa
index 6bc2a56c61ccdb541faf9b89143cd1ae04c12a83..00daa7e68f597ae7ebd1b537aad3520734d7db3d 100644 (file)
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -96,20 +96,20 @@ ifeq "$(KMOD)" "1"
        cd $(DIR_SRC)/alsa-driver-$(VER) && sed -i -e "s| soc/ | |g" Makefile
        cd $(DIR_SRC)/alsa-driver-$(VER) && sed -i -e "s| soc||g" Makefile
        cd $(DIR_SRC)/alsa-driver-$(VER) && ./configure --with-kernel=/usr/src/linux
-       cd $(DIR_SRC)/alsa-driver-$(VER) && make
+       cd $(DIR_SRC)/alsa-driver-$(VER) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_SRC)/alsa-driver-$(VER) && make install
 else
        cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --enable-static
-       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-utils-$(VER).tar.bz2
        cd $(DIR_SRC)/alsa-utils-$(VER) && ./configure
-       cd $(DIR_SRC)/alsa-utils-$(VER) && make $(MAKETUNING)
+       cd $(DIR_SRC)/alsa-utils-$(VER) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_SRC)/alsa-utils-$(VER) && make install
        cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-firmware-$(VER).tar.bz2
        cd $(DIR_SRC)/alsa-firmware-$(VER) && ./configure
-       cd $(DIR_SRC)/alsa-firmware-$(VER) && make $(MAKETUNING)
+       cd $(DIR_SRC)/alsa-firmware-$(VER) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_SRC)/alsa-firmware-$(VER) && make install
 endif
        @rm -rf $(DIR_SRC)/alsa*

diff --git a/lfs/beep b/lfs/beep
index 6a676e690255e5439d3bcf009c70015c4e8df3d0..dc0d22c4130837eb3727e0916ca0a4ff68d68da5 100644 (file)
--- a/lfs/beep
+++ b/lfs/beep
@@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && install -m 0755 beep /usr/bin
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/busybox b/lfs/busybox
index 491de505e2b235cd22a256f1a4c8c01b66be2692..cdea9ef8c0d55214a654e243a0567426ec113d0b 100644 (file)
--- a/lfs/busybox
+++ b/lfs/busybox
@@ -73,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        -mkdir -p /install/initrd/{{,s}bin,etc}
        cd $(DIR_APP) && cp -f $(DIR_SRC)/config/uClibc/busybox.config .config
        cd $(DIR_APP) && make oldconfig
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        mkdir -p /install/initrd/usr/share/udhcpc
        cd $(DIR_APP) && install -m 0755 examples/udhcp/simple.script \

diff --git a/lfs/ccache b/lfs/ccache
index 86a5fd4d79afe63b63b678836c2c98f08fe0247d..83ed803eb0998037ad6d06d98a6dd627e9ee6e96 100644 (file)
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -72,7 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -p0 < $(DIR_SRC)/src/patches/$(THISAPP).patch
        cd $(DIR_APP) && CFLAGS="-O2 -static" ./configure --prefix=$(ROOT)/usr/local
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        ln -sf ccache $(ROOT)/usr/local/bin/gcc
        ln -sf ccache $(ROOT)/usr/local/bin/g++

diff --git a/lfs/cups b/lfs/cups
index 288e29a750f930a76411ae76f8f42aa6ce569a33..aab56d17720b83ed8726bc612ae5e3e904ef544e 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 #      cd $(DIR_APP) && sed -i -e "s@pam/pam@security/pam@g" {config-scripts/cups-pam.m4,scheduler/auth.c,configure}
        cd $(DIR_APP) && ./configure --disable-nls --sysconfdir=/var/ipfire
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb
        install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/cups /etc/rc.d/init.d

diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd
index 907d5ea0ff8d5a6609637f9b79ca48c1848aff0a..b2041c1aecc6d6eb7011da0ed342ac81646abb6e 100644 (file)
--- a/lfs/cyrus-imapd
+++ b/lfs/cyrus-imapd
@@ -85,7 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                --with-auth=unix --with-perl --with-sasl --with-idle=idled \
                                --with-syslogfacility=MAIL --enable-listext --without-snmp
        cd $(DIR_APP) && make depend
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        -mkdir /var/imap
        chown cyrus:mail /var/imap

diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl
index f7accb700d7764d0723be1b60bbbf9694d5ba6cf..1f8282ef8557db76e0611f830386e3e0aa5a20ef 100644 (file)
--- a/lfs/cyrus-sasl
+++ b/lfs/cyrus-sasl
@@ -100,6 +100,7 @@ else
                            --with-dbpath=/var/lib/sasl/sasldb2 \
                            --with-saslauthd=/var/run \
                             --with-ldap --enable-ldapdb
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make -C include
        cd $(DIR_APP) && make -C sasldb
        cd $(DIR_APP) && make -C plugins

diff --git a/lfs/elinks b/lfs/elinks
index a553dd0c87b1c26112f8b2781096848787b0592c..a6e2d6eaa4c365828b8dcb1cf79d97d55ebdee72 100644 (file)
--- a/lfs/elinks
+++ b/lfs/elinks
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
 
        mkdir -p /usr/local/etc/elinks

diff --git a/lfs/etherwake b/lfs/etherwake
index e0d0f1c4442e629650bf3f7f932bb743dfc0c375..17ec9ca5dd4f5457fe30d4303b1dd5922718ec53 100644 (file)
--- a/lfs/etherwake
+++ b/lfs/etherwake
@@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index c84cb5d03f74bbeeda46d43c58b688b85e1995b4..55472c5ee2ed43f89a2aa318c78bc004a2ef0a47 100644 (file)
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -81,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                      --enable-shared \
                                     --enable-postproc \
                                     --enable-gpl
-       cd $(DIR_SRC)/ffmpeg && make
+       cd $(DIR_SRC)/ffmpeg && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_SRC)/ffmpeg && make install
        cd $(DIR_SRC)/ffmpeg && make install-libs
        ldconfig

diff --git a/lfs/hostapd b/lfs/hostapd
index 962027d7cbce8b4ae0bf6267288a5bf509705df2..a63e338aa01152b64185453dc7e01f6827715675 100644 (file)
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && cp $(DIR_SRC)/config/hostapd/config ./.config
        cd $(DIR_APP) && sed -e "s@/usr/local@/usr@g" -i Makefile
-       cd $(DIR_APP) && make && make install
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) && make install
        cp -vrf $(DIR_SRC)/config/hostapd/hostapd.conf /etc/hostapd.conf
        install -v -m 644 $(DIR_SRC)/config/backup/includes/hostapd /var/ipfire/backup/addons/includes/hostapd
        mkdir -p /var/ipfire/wlanap

diff --git a/lfs/iana-etc b/lfs/iana-etc
index 54fa33b2f9039974c8c2ee3809acc9a5ddef87f2..6bcbf343850cd1c5d8a46222fccdbaf85a16e0bd 100644 (file)
--- a/lfs/iana-etc
+++ b/lfs/iana-etc
@@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/icecast b/lfs/icecast
index d6bb84833ca26b4604d89984566188b8a089b53d..8fbbb5b9f924088d7f0970dfa8c3134f695c2499 100644 (file)
--- a/lfs/icecast
+++ b/lfs/icecast
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make 
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/iptables b/lfs/iptables
index a4d21b43c767facdbc5dee5939f0b7f12353d97c..eb5d0362a3bfc9314a8edc8a46f1c70f57e33abe 100644 (file)
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -108,12 +108,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-0.0.39.tar.bz2
        cd $(DIR_SRC)/libnfnetlink-0.0.39 && ./configure --prefix=/usr
-       cd $(DIR_SRC)/libnfnetlink-0.0.39 && make
+       cd $(DIR_SRC)/libnfnetlink-0.0.39 && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_SRC)/libnfnetlink-0.0.39 && make install
 
        cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_queue-0.0.16.tar.bz2
        cd $(DIR_SRC)/libnetfilter_queue-0.0.16 && ./configure --prefix=/usr
-       cd $(DIR_SRC)/libnetfilter_queue-0.0.16 && make
+       cd $(DIR_SRC)/libnetfilter_queue-0.0.16 && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_SRC)/libnetfilter_queue-0.0.16 && make install
        @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.39 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.16
        @$(POSTBUILD)

diff --git a/lfs/klibc b/lfs/klibc
index 4944afaaf86033baf000bcadd37d66d5970de6ab..0ff12f3ee05145127fa151a1742af826a9f89e52 100644 (file)
--- a/lfs/klibc
+++ b/lfs/klibc
@@ -76,9 +76,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                tar zxf $(DIR_DL)/klibc-extras-2.2.tar.gz
        cd $(DIR_APP) && ln -fs ../linux linux
        cd $(DIR_SRC)/klibc-extras && sed -i "s|^INSTALL = .*|INSTALL = /usr/bin/install -c -m 755|g" Makefile
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
-       cd $(DIR_SRC)/klibc-extras && make
+       cd $(DIR_SRC)/klibc-extras && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_SRC)/klibc-extras && make install
        ln -sf sh.shared /usr/lib/klibc/bin/sh
        #mv /lib/klibc-*.so /lib/klibc-pFXBYGYRiBAAryaZ7Zw_ISKpcTk.so

diff --git a/lfs/lame b/lfs/lame
index 604d505460fc696dc79deee7c8801cbcdce05952..51faa7a5ef2d2356cad056018ebf7fcbd1f84885 100644 (file)
--- a/lfs/lame
+++ b/lfs/lame
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr --enable-mp3rtp
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/libdvbpsi b/lfs/libdvbpsi
index 168f108d2d8528b16ba6fd681119e98f89d93f75..cc7f0e34d8f7dbf7e2bc373417f23b4e82004bec 100644 (file)
--- a/lfs/libdvbpsi
+++ b/lfs/libdvbpsi
@@ -78,7 +78,7 @@ $(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
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/libid3tag b/lfs/libid3tag
index 29cfc085012719f6378e95fef3b0a238ce72b362..bf81aab22fd650b36f07b5c6cd9d7070738a4352 100644 (file)
--- a/lfs/libid3tag
+++ b/lfs/libid3tag
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/libmad b/lfs/libmad
index 381a8f1ba49ef5805a5850018f5aa586595772e6..548374da07c86b0adfb2ecbc49582620dd449f6e 100644 (file)
--- a/lfs/libmad
+++ b/lfs/libmad
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/libogg b/lfs/libogg
index ca0129f014f71bb4ce94de49ebfebdd8902d380c..e2b660a32e831a89c0e9d4c3d478198873ffc237 100644 (file)
--- a/lfs/libogg
+++ b/lfs/libogg
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/libshout b/lfs/libshout
index 14fde733c1134a10a072a7ac14a34f4be9f0fed1..ac36811b3f59c7804f7c9c0aa7947184861965ce 100644 (file)
--- a/lfs/libshout
+++ b/lfs/libshout
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/libtorrent b/lfs/libtorrent
index 0874769985b3bca5da69dc167b0e2054b202ce42..c628f1abd7431ada0c011e14dd3965deca626217 100644 (file)
--- a/lfs/libtorrent
+++ b/lfs/libtorrent
@@ -73,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr --disable-ipv6
-       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/libvorbis b/lfs/libvorbis
index ebd2be000bed4b6206e7a9e87a7fb01824ff55b1..9d7defd2762a1d4f8460488a5e7514997099ecf3 100644 (file)
--- a/lfs/libvorbis
+++ b/lfs/libvorbis
@@ -78,7 +78,7 @@ $(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
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        #cd $(DIR_APP) && sed -i.bak -e 's/-mno-ieee-fp//' lib/Makefile
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && install -v -m644 doc/Vorbis* /usr/share/doc/libvorbis-1.2.0

diff --git a/lfs/libwww-perl b/lfs/libwww-perl
index 637ab9b9bac031518651ee10e50ad4ba1cab26a1..6bee1ddd86baab785e5d810b11769c9b01b25b7c 100644 (file)
--- a/lfs/libwww-perl
+++ b/lfs/libwww-perl
@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && perl Makefile.PL -n
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/linux-atm b/lfs/linux-atm
index ca53fe6b481b020d93fbe3e13b056b2d8e317d3f..1dedec9c8f64add3f56d51e419a2318c6101075f 100644 (file)
--- a/lfs/linux-atm
+++ b/lfs/linux-atm
@@ -72,7 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-atm-2.4.1-gcc-4.patch
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-nls
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/man-pages b/lfs/man-pages
index 3ec2713118c09bf44c17c7923920dab2ea2a28c6..2ea81b30f5fafcc3f6e77ae6671c2dcb06002207 100644 (file)
--- a/lfs/man-pages
+++ b/lfs/man-pages
@@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/memtest b/lfs/memtest
index 7ced44764e7037e290e506e703583e1bd8c61b6b..820b4aec54db0bb48b18c29ea796261d3c3d867d 100644 (file)
--- a/lfs/memtest
+++ b/lfs/memtest
@@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        -mkdir -p /usr/lib/memtest86+
        cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+
        @rm -rf $(DIR_APP)

diff --git a/lfs/mldonkey b/lfs/mldonkey
index bef1215ea8128d359bc6c424efe1efff9064f524..1d22f404abca648021db1965bac67026e75ca300 100644 (file)
--- a/lfs/mldonkey
+++ b/lfs/mldonkey
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/opt/mldonkey --enable-pthread-lib \
                                --disable-gnutella --disable-gnutella2 --disable-fasttrack
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        -mkdir -p /opt/mldonkey
        -mkdir -p /opt/mldonkey/.mldonkey
        cd $(DIR_APP) && cp -f mlnet /opt/mldonkey

diff --git a/lfs/ncftp b/lfs/ncftp
index 900af9d716be5093910ad42a79a831e5bf2b18f4..81f2f54138704d0b641deb39f92b13fbe7d8aa9d 100644 (file)
--- a/lfs/ncftp
+++ b/lfs/ncftp
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr && make -C libncftp shared && \
                                make -C libncftp soinstall
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/nfs b/lfs/nfs
index e56df07c331b789265d698714a21398ce546965c..005c0e0fe4bd397a33e63a2ef97be6c652548a8f 100644 (file)
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc  \
                                     --disable-nfsv4 --disable-gss
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/nmap b/lfs/nmap
index b8fcfaa5052ce4dd407b1409be5f460fd44019d7..028f15ecf8dcd64c0bea03782160758391674fa5 100644 (file)
--- a/lfs/nmap
+++ b/lfs/nmap
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr --without-nmapfe
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/ocaml b/lfs/ocaml
index 2ed979fda17908ba09b3f1c498dc7005df7274ce..656c7ebfc1768b830d853b75341716c9098b3529 100644 (file)
--- a/lfs/ocaml
+++ b/lfs/ocaml
@@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure -prefix /usr
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make world
        cd $(DIR_APP) && make opt
        cd $(DIR_APP) && make install

diff --git a/lfs/openldap b/lfs/openldap
index 8d4024d8c828e521e92ad2ce3e448698f2a4cf49..346524e9aa35c3bf4233785c0408b63abda4a105 100644 (file)
--- a/lfs/openldap
+++ b/lfs/openldap
@@ -92,7 +92,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                            --enable-ppolicy \
                            --enable-valsort
        cd $(DIR_APP) && make depend
-       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        chmod -v 755 /usr/lib/libl*-2.3.so.0.2.8
        @rm -rf $(DIR_APP)

diff --git a/lfs/openssh b/lfs/openssh
index f3bf4f5a1783340fe5ce0e7b1ac19e83cd2c2657..4a873a341aba191aa693c92935369d56cc56310f 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -36,13 +36,11 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) openssh5.1-dynwindow_noneswitch.diff.gz
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-openssh5.1-dynwindow_noneswitch.diff.gz = $(DL_FROM)/openssh5.1-dynwindow_noneswitch.diff.gz
 
 $(DL_FILE)_MD5 = 03f2d0c1b5ec60d4ac9997a146d2faec
-openssh5.1-dynwindow_noneswitch.diff.gz_MD5 = 6b6ef30f4fefc462f61df57dd6ae8756
 
 install : $(TARGET)
 
@@ -75,7 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 ifeq "$(PADLOCK)" "1"
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssh-4.7p1-padlock.patch
 endif
-       cd $(DIR_APP) && gzip -d -c $(DIR_DL)/openssh5.1-dynwindow_noneswitch.diff.gz | patch -Np1
        cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc/ssh \
                    --libexecdir=/usr/lib/openssh --with-md5-passwords \

diff --git a/lfs/openswan b/lfs/openswan
index bcd66487c4b610087c6f79c2e44370f677f2ce27..ccbd4db3d92e2dbcd9658eb8223b0c28a50fe861 100644 (file)
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 ifeq "$(KMOD)" "1"
-       cd $(DIR_APP) && make KERNELSRC=/usr/src/linux module
+       cd $(DIR_APP) && make KERNELSRC=/usr/src/linux module $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make minstall
 else
        cd $(DIR_APP) && sed -i \

diff --git a/lfs/pammysql b/lfs/pammysql
index 78da051030d5a62ede6dfa21d5141715e7c04ee7..a9f15bbe78cdc409d924d23223753fabb7f920d5 100644 (file)
--- a/lfs/pammysql
+++ b/lfs/pammysql
@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --with-pam=/usr --with-pam-mods-dir=/lib/security --with-mysql=/usr --with-openssl=/usr    # --with-cyrus-sasl2=/usr
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/php b/lfs/php
index d5cd224d28fe8ddf641518ff722bdbb28796774e..a679a071d5638e207e071663f264fd71268d706f 100644 (file)
--- a/lfs/php
+++ b/lfs/php
@@ -133,7 +133,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        -rm -f $(DIR_SRC)/package.xml
        cd $(DIR_SRC)/idn-* && phpize
        cd $(DIR_SRC)/idn-* && ./configure --prefix=/usr --with-idn
-       cd $(DIR_SRC)/idn-* && make
+       cd $(DIR_SRC)/idn-* && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_SRC)/idn-* && make install
        cd $(DIR_SRC) && tar xfz $(DIR_DL)/Log-1.9.11.tgz
        -rm -f $(DIR_SRC)/package.xml

diff --git a/lfs/pkg-config b/lfs/pkg-config
index 2e968855629b78e329ebe29a2f18db77b4c85570..b3db91f2a91c6ad35e4e07696e3df26ea67e8d46 100644 (file)
--- a/lfs/pkg-config
+++ b/lfs/pkg-config
@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/portmap b/lfs/portmap
index d6c869e3e744694aa6266cf2b572666c7210ff52..ef0964e236c099381ce27331adb4504f30f75bbf 100644 (file)
--- a/lfs/portmap
+++ b/lfs/portmap
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/portmap-5beta-compilation_fixes-3.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/portmap-5beta-glibc_errno_fix-1.patch
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/rsync b/lfs/rsync
index f39843f24c16dc90b718d1ce00635075d4aef4ec..dcb9ab49b618459fcfd4c4c1bef64ec82c657b0b 100644 (file)
--- a/lfs/rsync
+++ b/lfs/rsync
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        #cd $(DIR_APP)/doc && docbook2html rsync.sgml
        cd $(DIR_APP) && make install
        #cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/rsync-$(VER) &&

diff --git a/lfs/rtorrent b/lfs/rtorrent
index 06e56613558ef2624c07f98a9b67f8346f38cc43..ac85fa50ab5a59bc404b9ec75b268ed6cafbf770 100644 (file)
--- a/lfs/rtorrent
+++ b/lfs/rtorrent
@@ -80,7 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr
-       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/samba b/lfs/samba
index 53914bfcf23bad59813ae0d2014a318dba39241e..d026fd5088102c3105ce1fb8a2ee14cb12f1f99d 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -89,7 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                --enable-cups \
                                --with-cifsmount \
                                --with-syslog
-       cd $(DIR_APP)/source && make
+       cd $(DIR_APP)/source && make proto && make all $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP)/source && make install
        cp -vfp /usr/lib/samba/{libsmbclient.so.0,libtalloc.so.1,libtdb.so.1,libwbclient.so.0} /usr/lib
        cd /usr/lib/ && ln -v -sf libsmbclient.so.0 libsmbclient.so

diff --git a/lfs/slang b/lfs/slang
index efe67b22d890e4ed9363628e480f8d35effd5350..542d32ff100aa07f34ae22b0ad724b675e7ee1e0 100644 (file)
--- a/lfs/slang
+++ b/lfs/slang
@@ -81,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 ifeq "$(LFS_PASS)" "install"
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/slang-1.4.9-uclibc.patch
        cd $(DIR_APP) && ./configure --prefix=""
-       cd $(DIR_APP)/src && make
+       cd $(DIR_APP)/src && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP)/src && make install DESTDIR="/opt/$(MACHINE)-uClibc"
        ln -sf libslang-utf8.a /opt/$(MACHINE)-uClibc/lib/libslang.a
 else

diff --git a/lfs/sox b/lfs/sox
index f8998c21e6a883f8bbed7aae938db8132fbf4905..cad16e55f67113ae827dc6843ab4bd38375b69fb 100644 (file)
--- a/lfs/sox
+++ b/lfs/sox
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr --disable-alsa-dsp --disable-oss-dsp \
                                --disable-sun-audio --disable-mad
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/spamassassin b/lfs/spamassassin
index 8d864c1328a625d2846264e39151ccea30ae677e..fba8364dada1832f9681e9bd24163474c5c94f54 100644 (file)
--- a/lfs/spamassassin
+++ b/lfs/spamassassin
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && yes 'n' | perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/tripwire b/lfs/tripwire
index 62034b28c3a74e3ff66674c9237d5c2a90b8ea8e..9942441e908017c99b4f52e60e15ebc1a40f0259 100644 (file)
--- a/lfs/tripwire
+++ b/lfs/tripwire
@@ -87,7 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                                                                                        -e 's@^TW_LOCAL_PASS=""@TW_LOCAL_PASS="ipfire"@' \
                                                                                                        install/install.sh
        cd $(DIR_APP)-src && ./configure --prefix=/usr --sysconfdir=/var/ipfire/tripwire
-       cd $(DIR_APP)-src && make $(MAKETUNING)
+       cd $(DIR_APP)-src && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP)-src && for i in siggen tripwire twadmin twprint; do \
                                                                                                        cp -vf $(DIR_APP)-src/bin/$$i /usr/sbin; \
                                                                                         done

diff --git a/lfs/vdr b/lfs/vdr
index f7197e63c01ae1cce342b868ef853fdd95a548db..75bd044c6ecbc8e1804088644f76dcd7d007c545 100644 (file)
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -95,9 +95,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP)/PLUGINS/src && tar jxf $(DIR_DL)/$(DL_FILE3)
        cd $(DIR_APP)/PLUGINS/src && ln -s vidix-1.0.0 vidix
        cd $(DIR_APP)/PLUGINS/src/vidix && ./configure
-       cd $(DIR_APP) && make VIDEODIR=/var/video plugins $(MAKETUNING)
-       cd $(DIR_APP) && make VIDEODIR=/var/video vdr $(MAKETUNING)
-       cd $(DIR_APP) && make DFB_SUPPORT=1  FB_SUPPORT=1  VIDIX_SUPPORT=1  $(MAKETUNING)
+       cd $(DIR_APP) && make VIDEODIR=/var/video plugins $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make VIDEODIR=/var/video vdr $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make DFB_SUPPORT=1  FB_SUPPORT=1  VIDIX_SUPPORT=1  $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make PREFIX=. DESTDIR=/opt/vdr/ install
        -mkdir -p /opt/vdr/etc
        cd $(DIR_APP) && install *.conf /opt/vdr/etc/

diff --git a/lfs/w_scan b/lfs/w_scan
index 7320c18a267ce47b5968c1db370f3ebfc09f7628..0fc3ccae9e1097685f76661c94695b7c0cc638d6 100644 (file)
--- a/lfs/w_scan
+++ b/lfs/w_scan
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch < $(DIR_SRC)/src/patches/w_scan-ipfire.patch 
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && install -m 755 w_scan /opt/vdr/bin/
        cd $(DIR_APP) && install -m 755 w_scan_start.sh /opt/vdr/bin/w_scan_start
        @rm -rf $(DIR_APP)