Disable copybreak

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

diff --git a/Makefile.am b/Makefile.am
index 955f2b799ee7901da90bac1663e150443756b384..4aa7314b59998580139a0785e73da0cf0fddba8d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,6 +31,7 @@ AUTOMAKE_OPTIONS = color-tests
 configdir        = $(sysconfdir)/network
 bashcompletiondir= $(datadir)/bash-completion/completions
 libexecdir       = $(prefix)/lib
+modprobedir      = $(prefix)/lib/modprobe.d
 pkgconfigdir     = $(libdir)/pkgconfig
 pppdir           = $(sysconfdir)/ppp
 systemconfigdir  = $(datadir)/network
@@ -114,9 +115,7 @@ dist_doc_DATA = \
 
 dist_sbin_SCRIPTS = \
        src/dhclient-script \
-       src/firewall-config \
-       src/firewall4 \
-       src/firewall6 \
+       src/firewall \
        src/network
 
 network_DATA = \
@@ -207,7 +206,6 @@ dist_network_SCRIPTS = \
 
 dist_helpers_SCRIPTS = \
        src/helpers/dhcpd-config-helper \
-       src/helpers/firewall-kernel-init \
        src/helpers/hostapd-config-helper \
        src/helpers/ipsec-updown \
        src/helpers/pppd-angel \
@@ -364,8 +362,7 @@ UNINSTALL_EXEC_HOOKS += ppp-uninstall-hook
 
 if HAVE_SYSTEMD
 systemdsystemunit_DATA = \
-       src/systemd/firewall4.service \
-       src/systemd/firewall6.service \
+       src/systemd/firewall.service \
        src/systemd/firewall-init.service \
        src/systemd/network-init.service \
        src/systemd/network@.service
@@ -378,8 +375,7 @@ INSTALL_DIRS += \
 endif
 
 EXTRA_DIST += \
-       src/systemd/firewall4.service.in \
-       src/systemd/firewall6.service.in \
+       src/systemd/firewall.service.in \
        src/systemd/firewall-init.service.in \
        src/systemd/network-init.service.in \
        src/systemd/network@.service.in
@@ -401,6 +397,11 @@ dist_sysctl_DATA = \
 
 # ------------------------------------------------------------------------------
 
+dist_modprobe_DATA = \
+       src/modprobe.d/no-copybreak.conf
+
+# ------------------------------------------------------------------------------
+
 dist_bashcompletion_SCRIPTS = \
        src/bash-completion/network
 
@@ -465,6 +466,7 @@ MANPAGES = \
        man/network-route-static.8 \
        man/network-settings.8 \
        man/network-vpn.8 \
+       man/network-vpn-ipsec.8 \
        man/network-vpn-security-policies.8 \
        man/network-zone.8 \
        man/network-zone-bridge.8 \
@@ -485,15 +487,13 @@ MANPAGES_XML  = $(patsubst %.txt,%.xml,$(MANPAGES_TXT))
 .PHONY: man
 man: $(MANPAGES) $(MANPAGES_HTML)
 
+if ENABLE_MANPAGES
 man_MANS = \
        $(MANPAGES)
-
-noinst_DATA += \
-       $(MANPAGES_HTML) \
-       $(MANPAGES_XML)
+endif
 
 CLEANFILES += \
-       $(man_MANS) \
+       $(MANPAGES) \
        $(MANPAGES_HTML) \
        $(MANPAGES_XML)