Change dns command to dns-server.

[people/ms/network.git] / Makefile

diff --git a/Makefile b/Makefile
index 3d2300c0893b7d779ed8612e908d9d38051a33e5..f110cd448f34ca6010198ea921ef5cc73654ec22 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
 
-NAME = network
-VER  = 003
+include Makeconfig
 
 DESTDIR=
 
@@ -8,6 +7,7 @@ prefix=/usr
 bindir=$(prefix)/bin
 sbindir=$(prefix)/sbin
 libdir=$(prefix)/lib
+datadir=$(prefix)/share
 sysconfdir=/etc
 localstatedir=/var
 systemdunitdir=$(prefix)/lib/systemd/system
@@ -16,9 +16,11 @@ tmpfilesdir=$(prefix)/lib/tmpfiles.d
 # File to store the version number in.
 VERSION_FILE = $(DESTDIR)$(libdir)/network/version
 
+.PHONY: all
 all:
-       @echo "Nothing to do here."
+       make -C man all
 
+.PHONY: install
 install:
        -mkdir -pv $(DESTDIR)$(sysconfdir)/{network/{ports,zones},ppp}
        -mkdir -pv $(DESTDIR)$(libdir)/{network,sysctl.d,udev}
@@ -26,6 +28,7 @@ install:
        -mkdir -pv $(DESTDIR)$(sbindir)
        -mkdir -pv $(DESTDIR)$(systemdunitdir)
        -mkdir -pv $(DESTDIR)$(tmpfilesdir)
+       -mkdir -pv $(DESTDIR)$(datadir)/firewall
 
        install -m 755 -v firewall $(DESTDIR)$(sbindir)
        install -m 755 -v network $(DESTDIR)$(sbindir)
@@ -37,8 +40,14 @@ install:
        cp -vf  systemd/*.service $(DESTDIR)$(systemdunitdir)
        cp -vf network.tmpfiles $(DESTDIR)$(tmpfilesdir)/network.conf
 
-       # Install bridge-stp. 
-       install -m 755 bridge-stp $(DESTDIR)$(sbindir)/
+       # Install the helper tools.
+       -mkdir -pv $(DESTDIR)$(libdir)/network/helpers
+       cp -vf helpers/* $(DESTDIR)$(libdir)/network/helpers
+
+       # Install bridge-stp.
+       ln -svf --relative \
+               $(DESTDIR)$(libdir)/network/helpers/bridge-stp \
+               $(DESTDIR)$(sbindir)/
 
        # Install dhclient script and helper.
        install -m 755 dhclient-helper $(DESTDIR)$(libdir)/network/
@@ -50,13 +59,22 @@ install:
        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
+       install -m 755 -v ppp/dialer $(DESTDIR)$(libdir)/network/
+
+       # Install pppoe-server wrapper.
+       install -m 755 ppp/pppoe-server $(DESTDIR)$(libdir)/network/
+
+       # Install the firewall macros.
+       cp -av macros $(DESTDIR)$(datadir)/firewall/
 
        # Create the version file.
        : > $(VERSION_FILE)
        echo "# This file is automatically generated." >> $(VERSION_FILE)
-       echo "NETWORK_VERSION=$(VER)" >> $(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