logging: Fix logging to the debug console.

[people/ms/network.git] / Makefile

diff --git a/Makefile b/Makefile
index c6c83bf719a8a0fabdb53683f89bb029f123d445..0fb47447d5b802546c98ccce22e1b6df7c9a7e33 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,41 +1,70 @@
 
-NAME = network
-VER  = 003
+include Makeconfig
 
 DESTDIR=
 
+prefix=/usr
+bindir=$(prefix)/bin
+sbindir=$(prefix)/sbin
+libdir=$(prefix)/lib
+sysconfdir=/etc
+localstatedir=/var
+systemdunitdir=$(prefix)/lib/systemd/system
+tmpfilesdir=$(prefix)/lib/tmpfiles.d
+
 # File to store the version number in.
-VERSION_FILE = $(DESTDIR)/lib/network/version
+VERSION_FILE = $(DESTDIR)$(libdir)/network/version
 
+.PHONY: all
 all:
-       @echo "Nothing to do here."
+       make -C man all
 
+.PHONY: install
 install:
-       -mkdir -pv $(DESTDIR)/etc/{network,ppp}
-       -mkdir -pv $(DESTDIR)/lib/{network,sysctl.d,udev}
-       -mkdir -pv $(DESTDIR)/sbin
-       -mkdir -pv $(DESTDIR)/var/log/network
-
-       install -m 755 -v network $(DESTDIR)/sbin
-
-       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/
-
-       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
+       -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)
+       -mkdir -pv $(DESTDIR)$(systemdunitdir)
+       -mkdir -pv $(DESTDIR)$(tmpfilesdir)
+
+       install -m 755 -v firewall $(DESTDIR)$(sbindir)
+       install -m 755 -v network $(DESTDIR)$(sbindir)
+
+       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/
+       cp -vf  systemd/*.service $(DESTDIR)$(systemdunitdir)
+       cp -vf network.tmpfiles $(DESTDIR)$(tmpfilesdir)/network.conf
+
+       # Install the helper tools.
+       -mkdir -pv $(DESTDIR)$(libdir)/network/helpers
+       cp -vf helpers/* $(DESTDIR)$(libdir)/network/helpers
+
+       # Install bridge-stp. 
+       install -m 755 bridge-stp $(DESTDIR)$(sbindir)/
+
+       # Install dhclient script and helper.
+       install -m 755 dhclient-helper $(DESTDIR)$(libdir)/network/
+       install -m 755 dhclient-script $(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}
-       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=$(PACKAGE_VERSION)" >> $(VERSION_FILE)
+
+       # Descend into subdirectories.
+       make -C man install
 
 dist:
-       git archive --format tar --prefix $(NAME)-$(VER)/ HEAD | gzip -9 > \
-               $(NAME)-$(VER).tar.gz
+       git archive --format tar --prefix $(PACKAGE_NAME)-$(PACKAGE_VERSION)/ HEAD | gzip -9 > \
+               $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz