From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Thu, 3 May 2012 19:11:43 +0000 (+0200)
Subject: Remove all hardcoded path now use switches for it - also perform UsrMove.
X-Git-Tag: 004~87^2
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fnetwork.git;a=commitdiff_plain;h=120c08300b7b6ffa3bf2c13c9d87cc674bb6fa82

Remove all hardcoded path now use switches for it - also perform UsrMove.
---

diff --git a/Makefile b/Makefile
index 7d51cc62..e33359f1 100644
--- a/Makefile
+++ b/Makefile
@@ -4,35 +4,42 @@ VER  = 003
 
 DESTDIR=
 
+prefix=/usr
+bindir=$(prefix)/bin
+sbindir=$(prefix)/sbin
+libdir=$(prefix)/lib
+sysconfdir=/etc
+localstatedir=/var
+
 # File to store the version number in.
-VERSION_FILE = $(DESTDIR)/lib/network/version
+VERSION_FILE = $(DESTDIR)$(libdir)/network/version
 
 all:
 	@echo "Nothing to do here."
 
 install:
-	-mkdir -pv $(DESTDIR)/etc/{network/{ports,zones},ppp}
-	-mkdir -pv $(DESTDIR)/lib/{network,sysctl.d,udev}
-	-mkdir -pv $(DESTDIR)/var/log/network
-	-mkdir -pv $(DESTDIR)/sbin
+	-mkdir -pv $(DESTDIR)$(sysconfdir)/{network/{ports,zones},ppp}
+	-mkdir -pv $(DESTDIR)$(libdir)/{network,sysctl.d,udev}
+	-mkdir -pv $(DESTDIR)$(localstatedir)/log/network
+	-mkdir -pv $(DESTDIR)$(sbindir)
 
-	install -m 755 -v network $(DESTDIR)/sbin
+	install -m 755 -v network $(DESTDIR)$(sbindir)
 
-	cp -rfv {hooks,header*,functions*} $(DESTDIR)/lib/network/
-	cp -fv  sysctl.d/* $(DESTDIR)/lib/sysctl.d/
-	cp -rfv udev/* $(DESTDIR)/lib/udev
-	cp -rfv network-* $(DESTDIR)/lib/network/
+	cp -rfv {hooks,header*,functions*} $(DESTDIR)$(libdir)/network/
+	cp -fv  sysctl.d/* $(DESTDIR)$(libdir)/sysctl.d/
+	cp -rfv udev/* $(DESTDIR)$(libdir)/udev
+	cp -rfv network-* $(DESTDIR)$(libdir)/network/
 
 	# Install bridge-stp. 
-	install -m 755 bridge-stp $(DESTDIR)/sbin/
-
-	install -m 755 -v ppp/ip-updown $(DESTDIR)/etc/ppp
-	ln -svf ip-updown $(DESTDIR)/etc/ppp/ip-pre-up
-	ln -svf ip-updown $(DESTDIR)/etc/ppp/ip-up
-	ln -svf ip-updown $(DESTDIR)/etc/ppp/ip-down
-	ln -svf ip-updown ${DESTDIR}/etc/ppp/ipv6-up
-	ln -svf ip-updown ${DESTDIR}/etc/ppp/ipv6-down
-	install -m 755 -v ppp/dialer $(DESTDIR)/etc/ppp
+	install -m 755 bridge-stp $(DESTDIR)$(sbindir)/
+
+	install -m 755 -v ppp/ip-updown $(DESTDIR)$(sysconfdir)/ppp
+	ln -svf ip-updown $(DESTDIR)$(sysconfdir)/ppp/ip-pre-up
+	ln -svf ip-updown $(DESTDIR)$(sysconfdir)/ppp/ip-up
+	ln -svf ip-updown $(DESTDIR)$(sysconfdir)/ppp/ip-down
+	ln -svf ip-updown ${DESTDIR}$(sysconfdir)/ppp/ipv6-up
+	ln -svf ip-updown ${DESTDIR}$(sysconfdir)/ppp/ipv6-down
+	install -m 755 -v ppp/dialer $(DESTDIR)$(sysconfdir)/ppp
 
 	# Create the version file.
 	: > ${VERSION_FILE}