From 1b97c07d6168853ed86db220231b43991753131d Mon Sep 17 00:00:00 2001
From: Bart De Schuymer <bdschuym@pandora.be>
Date: Wed, 15 Aug 2007 13:06:32 +0000
Subject: fix BINDIR+cleanup (Peter Volkov)

---
 userspace/arptables/Makefile | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

(limited to 'userspace/arptables/Makefile')

diff --git a/userspace/arptables/Makefile b/userspace/arptables/Makefile
index 99f8de6..ed4bb39 100644
--- a/userspace/arptables/Makefile
+++ b/userspace/arptables/Makefile
@@ -14,13 +14,6 @@ BINDIR:=$(PREFIX)/sbin
 MANDIR:=$(PREFIX)/man
 DESTDIR:=
 
-# include DESTDIR param
-override LIBDIR:=$(DESTDIR)$(LIBDIR)
-override MANDIR:=$(DESTDIR)$(MANDIR)
-override BINDIR:=$(DESTDIR)$(BINDIR)
-
-
-BINFILE:=$(BINDIR)/arptables
 
 # directory for new arptables releases
 RELEASE_DIR:=/tmp
@@ -28,9 +21,6 @@ RELEASE_DIR:=/tmp
 COPT_FLAGS:=-O2
 CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG
 
-EXTRAS+=iptables iptables.o
-EXTRA_INSTALLS+=$(BINDIR)/iptables $(MANDIR)/man8/iptables.8
-
 ifndef ARPT_LIBDIR
 ARPT_LIBDIR:=$(LIBDIR)/arptables
 endif
@@ -40,29 +30,25 @@ include extensions/Makefile
 all: arptables
 
 arptables.o: arptables.c
-	$(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 arptables-standalone.o: arptables-standalone.c
-	$(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 libarptc/libarptc.o: libarptc/libarptc.c libarptc/libarptc_incl.c
-	$(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 arptables: arptables-standalone.o arptables.o libarptc/libarptc.o $(EXT_OBJS)
-	$(CC) $(CFLAGS)  -o $@ $^
-
-$(BINDIR)/arptables: arptables
-	mkdir -p $(BINDIR)
-	cp $< $@
+	$(CC) $(CFLAGS) -o $@ $^
 
 $(MANDIR)/man8/arptables.8: arptables.8
-	mkdir -p $(@D)
-	install -m 0644 -o root -g root $< $@
+	mkdir -p $(DESTDIR)$(@D)
+	install -m 0644 -o root -g root $< $(DESTDIR)$@
 
 .PHONY: exec
 exec: arptables
-	mkdir -p $(BINDIR)
-	install -m 0755 -o root -g root $< $(BINFILE)
+	mkdir -p $(DESTDIR)$(BINDIR)
+	install -m 0755 -o root -g root $< $(DESTDIR)$(BINDIR)/arptables
 
 .PHONY: install
 install: $(MANDIR)/man8/arptables.8 exec
-- 
cgit v1.2.3