Merge remote-tracking branch 'stevee/UsrMove'

diff --cc Makefile
index 3be147e1ddbf39f8828a64befec77299410c8e3a,e33359f15bc4a91135bceeca5ec7c7ceb1d5a805..23c6a427ecaae03c96f9f091fecbdf62f5d55869
--- 1/Makefile
--- 2/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 -m 755 dhclient-helper ${DESTDIR}/usr/lib/network/
-       install -m 755 dhclient-script ${DESTDIR}/sbin/
 +      # Install dhclient script and helper.
-       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 dhclient-helper $(DESTDIR)/usr/lib/network/
++      install -m 755 dhclient-script $(DESTDIR)/sbin/
 +
 -      ln -svf ip-updown ${DESTDIR}$(sysconfdir)/ppp/ipv6-up
 -      ln -svf ip-updown ${DESTDIR}$(sysconfdir)/ppp/ipv6-down
+       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}
--      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 > \