From 01efa9dfb2c6b5cd178efedeb963f717d7ba2fd3 Mon Sep 17 00:00:00 2001
From: Bart De Schuymer <bdschuym@pandora.be>
Date: Wed, 11 Feb 2004 21:23:38 +0000
Subject: =?UTF-8?q?Sven=20K=F6hler:=20DESTDIR=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 userspace/arptables/Makefile | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'userspace/arptables/Makefile')

diff --git a/userspace/arptables/Makefile b/userspace/arptables/Makefile
index b217c2c..a8add38 100644
--- a/userspace/arptables/Makefile
+++ b/userspace/arptables/Makefile
@@ -7,11 +7,18 @@ endif
 ARPTABLES_VERSION:=0.0.3
 OLD_ARPTABLES_VERSION:=0.0.2
 
-PREFIX:=$(DESTDIR)/usr/local
+# default paths
+PREFIX:=/usr/local
 LIBDIR:=$(PREFIX)/lib
 BINDIR:=$(PREFIX)/sbin
 MANDIR:=$(PREFIX)/man
-INCDIR:=$(PREFIX)/include
+
+# include DESTDIR param
+override LIBDIR:=$(DESTDIR)$(LIBDIR)
+override MANDIR:=$(DESTDIR)$(MANDIR)
+override BINDIR:=$(DESTDIR)$(BINDIR)
+
+
 BINFILE:=$(BINDIR)/arptables
 
 # directory for new arptables releases
@@ -21,7 +28,7 @@ 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+=$(DESTDIR)$(BINDIR)/iptables $(DESTDIR)$(MANDIR)/man8/iptables.8
+EXTRA_INSTALLS+=$(BINDIR)/iptables $(MANDIR)/man8/iptables.8
 
 ifndef ARPT_LIBDIR
 ARPT_LIBDIR:=$(LIBDIR)/arptables
@@ -43,8 +50,8 @@ libarptc/libarptc.o: libarptc/libarptc.c libarptc/libarptc_incl.c
 arptables: arptables-standalone.o arptables.o libarptc/libarptc.o $(EXT_OBJS)
 	$(CC) $(CFLAGS)  -o $@ $^
 
-$(DESTDIR)$(BINDIR)/arptables: arptables
-	@[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
+$(BINDIR)/arptables: arptables
+	mkdir -p $(BINDIR)
 	cp $< $@
 
 $(MANDIR)/man8/arptables.8: arptables.8
@@ -53,6 +60,7 @@ $(MANDIR)/man8/arptables.8: arptables.8
 
 .PHONY: exec
 exec: arptables
+	mkdir -p $(BINDIR)
 	install -m 0755 -o root -g root $< $(BINFILE)
 
 .PHONY: install
-- 
cgit v1.2.3