This is only a build fix commit.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1097 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/.svnignore b/doc/.svnignore
index 8035f59daa39fc181a10a0d23cc85d3604e7e6bb..e86e1a1b5ba16232180ed0ced9b74d9e228be1cb 100644 (file)
--- a/doc/.svnignore
+++ b/doc/.svnignore
@@ -5,12 +5,12 @@
 *.img.gz
 .config
 .svnignore
-build
+build_*
 cache
 ccache
+distcc
 packages
-svn_status
-log
+log_*
 ipfire-source-*
 tmp
 ipfire-diff-*

diff --git a/lfs/br2684ctl b/lfs/br2684ctl
index 8299befec9ffbd490eed933f20607e7d07f3d597..b2a28d0005d2b5fe80b406d6511cb050f848df8b 100644 (file)
--- a/lfs/br2684ctl
+++ b/lfs/br2684ctl
@@ -52,8 +52,8 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_SRC)/br2684ctl
-       cd $(DIR_SRC) && gcc $(CFLAGS) -latm $(DIR_SRC)/src/br2684ctl/br2684ctl.c -o br2684ctl
-       cd $(DIR_SRC) && install -v -m 755 br2684ctl /usr/bin/br2684ctl
-       @rm -rf $(DIR_SRC)/br2684ctl
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && gcc $(CFLAGS) -latm br2684ctl.c -o br2684ctl
+       cd $(DIR_APP) && install -v -m 755 br2684ctl /usr/bin/br2684ctl
+       @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/dhcp b/lfs/dhcp
index cee454d276e39f10d25791ac031512390891cf4e..6b52722c4890a95538893cc5db46ffe4afc0cfa2 100644 (file)
--- a/lfs/dhcp
+++ b/lfs/dhcp
@@ -37,7 +37,7 @@ TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) $(THISAPP)-client_dns-1.patch $(THISAPP)-iproute2-1.patch
 
 install: $(TARGET)
 

diff --git a/lfs/iptables b/lfs/iptables
index 6c0d0a353ab54eb660a7c72bc7eec848010b85f0..1a1254516049632827627358790de2d92838bba3 100644 (file)
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -68,7 +68,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make LIBDIR=/lib KERNEL_DIR=/usr -j $(PARALLELISM)
        cd $(DIR_APP) && make PREFIX=/usr LIBDIR=/lib BINDIR=/sbin \
                MANDIR=/usr/share/man install install-devel
-       install -v -m644 iptables.xslt /lib/iptables
+       cd $(DIR_APP) && install -v -m644 iptables.xslt /lib/iptables
        
        ### Building IPP2P
        #

diff --git a/lfs/newt b/lfs/newt
index 3e4bd1e9f7342df7ea33664ca22b9f7c5f3da722..299a6eaa524ab27881a7923ccbe88acb334eaf01 100644 (file)
--- a/lfs/newt
+++ b/lfs/newt
@@ -37,7 +37,7 @@ TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) $(THISAPP)-snack.patch $(THISAPP)-whiptail.patch
 
 install: $(TARGET)
 

diff --git a/lfs/openssl b/lfs/openssl
index 2d648c19d50f2d23b26fdc92b545f5316840d69d..926944855106bc1f359b742abfb83553d32e37f6 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -37,7 +37,7 @@ TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) $(THISAPP)-fix_manpages-1.patch
 
 install: $(TARGET)
 

diff --git a/lfs/sudo b/lfs/sudo
index 044f3560b71ac567b51ee42a6a37d4927ff7a304..5c0f39e5edfe1e03d88992e91a0a43e7ce8c6bf7 100644 (file)
--- a/lfs/sudo
+++ b/lfs/sudo
@@ -37,7 +37,7 @@ TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) $(THISAPP)-envvar_fix-1.patch
 
 install: $(TARGET)