From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 17 May 2012 15:28:27 +0000 (+0000)
Subject: Merge remote-tracking branch 'stevee/UsrMove'
X-Git-Tag: 004~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef620c0750f20a22e74196dbb8c786e26b6260f9;p=network.git

Merge remote-tracking branch 'stevee/UsrMove'
---

ef620c0750f20a22e74196dbb8c786e26b6260f9
diff --cc Makefile
index 3be147e1,e33359f1..23c6a427
--- a/Makefile
+++ b/Makefile
@@@ -11,37 -18,33 +18,37 @@@ 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 bridge-stp $(DESTDIR)$(sbindir)/
  
 +	# Install dhclient script and helper.
- 	install -m 755 dhclient-helper ${DESTDIR}/usr/lib/network/
- 	install -m 755 dhclient-script ${DESTDIR}/sbin/
++	install -m 755 dhclient-helper $(DESTDIR)/usr/lib/network/
++	install -m 755 dhclient-script $(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 -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
++	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}
--	echo "# This file is automatically generated." >> ${VERSION_FILE}
--	echo "NETWORK_VERSION=$(VER)" >> ${VERSION_FILE}
++	: > $(VERSION_FILE)
++	echo "# This file is automatically generated." >> $(VERSION_FILE)
++	echo "NETWORK_VERSION=$(VER)" >> $(VERSION_FILE)
  
  dist:
  	git archive --format tar --prefix $(NAME)-$(VER)/ HEAD | gzip -9 > \