summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart De Schuymer <bdschuym@pandora.be>2004-02-11 21:23:38 +0000
committerBart De Schuymer <bdschuym@pandora.be>2004-02-11 21:23:38 +0000
commit3749f308bd5c3fef8d165f50e2ca7dc27ace1077 (patch)
tree168fbbaf0dbd27c8039f0464e57fdbc5c459237d
parent0f5e3febcbc9a4f513e3f70a9419c087f6efc83f (diff)
Sven Köhler: DESTDIR cleanup
-rw-r--r--Makefile22
1 files changed, 16 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index cc91da5..e25af6b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,19 @@ PROGNAME:=ebtables
PROGVERSION:=2.0.7
PROGDATE:=January\ 2004
-LIBDIR?=$(DESTDIR)/usr/lib/
-MANDIR?=$(DESTDIR)/usr/local/man
+# default paths
+LIBDIR:=/usr/lib/
+MANDIR:=/usr/local/man
+BINDIR:=/sbin
+ETCDIR:=/etc
+
+# include DESTDIR param
+override LIBDIR:=$(DESTDIR)$(LIBDIR)
+override MANDIR:=$(DESTDIR)$(MANDIR)
+override BINDIR:=$(DESTDIR)$(BINDIR)
+override ETCDIR:=$(DESTDIR)$(ETCDIR)
+
+
CFLAGS:=-Wall -Wunused
CC:=gcc
LD:=ld
@@ -23,11 +34,10 @@ OBJECTS:=$(OBJECTS2) ebtables.o $(EXT_OBJS) $(EXT_LIBS)
KERNEL_INCLUDES?=include/
-ETHERTYPESPATH?=$(DESTDIR)/etc
+ETHERTYPESPATH?=$(ETCDIR)
ETHERTYPESFILE:=$(ETHERTYPESPATH)/ethertypes
-BINPATH?=$(DESTDIR)/sbin/
-BINFILE:=$(BINPATH)ebtables
+BINFILE:=$(BINDIR)/ebtables
PROGSPECS:=-DPROGVERSION=\"$(PROGVERSION)\" \
-DPROGNAME=\"$(PROGNAME)\" \
@@ -68,7 +78,7 @@ $(ETHERTYPESFILE): ethertypes
.PHONY: exec
exec: ebtables
- mkdir -p $(BINPATH)
+ mkdir -p $(BINDIR)
install -m 0755 -o root -g root $< $(BINFILE)
.PHONY: install