Merge remote-tracking branch 'ipv6/master'

[people/stevee/network.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bf3886e585b5950a9fa997ea9df5c3679e87187b..94dfc75e0100a19f78d4cce0a73416b09f7039c7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,6 +46,8 @@ hooks_configsdir = $(hooksdir)/configs
 hooks_portsdir   = $(hooksdir)/ports
 hooks_zonesdir   = $(hooksdir)/zones
 
+triggersdir      = $(networkdir)/triggers
+
 CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST =
@@ -145,6 +147,7 @@ dist_network_SCRIPTS = \
        src/functions/functions.settings \
        src/functions/functions.stp \
        src/functions/functions.sysctl \
+       src/functions/functions.triggers \
        src/functions/functions.usb \
        src/functions/functions.util \
        src/functions/functions.vlan \
@@ -160,6 +163,7 @@ dist_network_SCRIPTS = \
        src/ppp/pppoe-server
 
 dist_helpers_SCRIPTS = \
+       src/helpers/aiccu \
        src/helpers/aiccu-config-helper \
        src/helpers/bridge-stp \
        src/helpers/dhcpd-config-helper \
@@ -182,6 +186,7 @@ dist_hooks_configs_SCRIPTS = \
        src/hooks/configs/ipv4-dhcp \
        src/hooks/configs/ipv4-static \
        src/hooks/configs/ipv6-auto \
+       src/hooks/configs/ipv6-dhcp \
        src/hooks/configs/ipv6-static \
        src/hooks/configs/pppoe-server
 
@@ -308,6 +313,11 @@ dist_macros_DATA = \
 
 # ------------------------------------------------------------------------------
 
+INSTALL_DIRS += \
+       $(triggersdir)
+
+# ------------------------------------------------------------------------------
+
 MANPAGES = \
        man/firewall-settings.8 \
        man/network.8 \