Merge remote-tracking branch 'jschlag/master'

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

diff --git a/Makefile.am b/Makefile.am
index 398576b874d512991499bef651fa9d7e266b9d0f..b28f03049f637a9ab4b1a4ed5bbac327f7fa8b5b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -234,6 +234,7 @@ dist_hooks_ports_SCRIPTS = \
 dist_hooks_zones_SCRIPTS = \
        src/hooks/zones/6to4-tunnel \
        src/hooks/zones/bridge \
+       src/hooks/zones/ip-tunnel \
        src/hooks/zones/modem \
        src/hooks/zones/pppoe \
        src/hooks/zones/wireless
@@ -442,9 +443,9 @@ MANPAGES = \
        man/network-vpn.8 \
        man/network-vpn-security-policies.8 \
        man/network-zone.8 \
-       man/network-zone-6to4-tunnel.8 \
        man/network-zone-bridge.8 \
        man/network-zone-config-pppoe-server.8 \
+       man/network-zone-ip-tunnel.8 \
        man/network-zone-modem.8 \
        man/network-zone-pppoe.8 \
        man/network-zone-wireless.8