/usr/local/sbin, not /usr/local/bin.

diff --git a/Makefile b/Makefile
index b09a4d99837f4aeeb8addf349e12701e9a96c3f9..19b5c5410151bd5e08bd07aa53052d22941eb6af 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ NETFILTER_VERSION:=1.2
 OLD_NETFILTER_VERSION:=1.1.2
 
 LIBDIR:=/usr/local/lib
-BINDIR:=/usr/local/bin
+BINDIR:=/usr/local/sbin
 MANDIR:=/usr/local/man
 INCDIR:=/usr/local/include
 

diff --git a/Rules.make b/Rules.make
index 8787dce2a0720dbaf2bd98829b29365aec0666eb..873820aa05bfb0d19c0f582013f3e36c200358a2 100644 (file)
--- a/Rules.make
+++ b/Rules.make
@@ -10,6 +10,10 @@ clean: $(EXTRA_CLEANS)
        @find . -name '*.[ao]' | xargs rm -f
 
 install: all $(EXTRA_INSTALLS)
+       @if [ -f /usr/local/bin/iptables -a "$(BINDIR)" = "/usr/local/sbin" ];\
+       then echo 'Erasing iptables from old location (now /usr/local/sbin).';\
+       rm -f /usr/local/bin/iptables;\
+       fi
 
 install-experimental: $(EXTRA_INSTALLS_EXP)