From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 6 Mar 2007 01:50:49 +0000 (-0800)
Subject: do not ignore build failures in subdirs of iproute2
X-Git-Tag: v2.6.23-071016~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95dd5950491a4f60265494969731c019fcd7f9bc;p=thirdparty%2Fiproute2.git

do not ignore build failures in subdirs of iproute2

if a file fails to compile in a subdir of iproute2 fails (say "tunnel.c" in
the "ip" dir), the top level makefile does not abort:
 all: Config
    @for i in $(SUBDIRS); \
    do $(MAKE) $(MFLAGS) -C $$i; done

the attached patch inserts a 'set -e' so that if the $(MAKE) fails, the all
target fails as well
-mike
---

diff --git a/Makefile b/Makefile
index 3fc3a1553..dbcb249a0 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,8 @@ SUBDIRS=lib ip tc misc netem genl
 LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
 
 all: Config
-	@for i in $(SUBDIRS); \
+	@set -e; \
+	for i in $(SUBDIRS); \
 	do $(MAKE) $(MFLAGS) -C $$i; done
 
 Config:
diff --git a/tc/m_ipt.c b/tc/m_ipt.c
index e1f68b33f..3d6533916 100644
--- a/tc/m_ipt.c
+++ b/tc/m_ipt.c
@@ -36,24 +36,9 @@
 #include <fcntl.h>
 #include <sys/wait.h>
 
-const char *pname = "tc-ipt";
-const char *tname = "mangle";
-const char *pversion = "0.1";
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-#ifndef IPT_LIB_DIR
-#define IPT_LIB_DIR "/usr/local/lib/iptables"
-#endif
-
-#ifndef PROC_SYS_MODPROBE
-#define PROC_SYS_MODPROBE "/proc/sys/kernel/modprobe"
-#endif
+static const char *pname = "tc-ipt";
+static const char *tname = "mangle";
+static const char *pversion = "0.1";
 
 static const char *ipthooks[] = {
 	"NF_IP_PRE_ROUTING",