conf: Generate strongswan.conf(5) man page in different directory

diff --git a/conf/.gitignore b/conf/.gitignore
index 1a3e5248ad086a05bc0c9744f3124f307e0b2a13..04065fbac6b362275facb81c00d0077b39b2476f 100644 (file)
--- a/conf/.gitignore
+++ b/conf/.gitignore
@@ -1,3 +1,4 @@
 default.conf
+strongswan.conf.5
 */*.conf
 */*.tmp
\ No newline at end of file

diff --git a/conf/Makefile.am b/conf/Makefile.am
index bdab4d39a3c98368df86823638b4c249cbf6d984..80dffc0259669153e67fa225c0f017772b771781 100644 (file)
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -19,11 +19,15 @@ plugins_install_src = $(charon_plugins:%=plugins/%.conf)
 
 strongswand_DATA = $(options:opt=conf)
 charonconf_DATA = $(plugins_install_src)
+man_MANS = \
+       strongswan.conf.5
 
 BUILT_SOURCES = default.conf $(confsnippets)
 EXTRA_DIST = format-options.py strongswan.conf default.opt \
        default.conf $(alloptions) $(confsnippets)
 
+CLEANFILES=$(man_MANS)
+
 .opt.conf:
        $(AM_V_GEN) \
        case "$<" in \

diff --git a/man/strongswan.conf.5.in b/conf/strongswan.conf.5.in
similarity index 100%
rename from man/strongswan.conf.5.in
rename to conf/strongswan.conf.5.in

diff --git a/configure.ac b/configure.ac
index cfa9b4a992545d89983d9c6fd536da0d207f98b7..5c7cf5df28b78a290f4a0b4fd993dcbca75fd096 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1545,9 +1545,9 @@ AC_CONFIG_FILES([
 # =================
 
 AC_CONFIG_FILES([
+       conf/strongswan.conf.5
        man/ipsec.conf.5
        man/ipsec.secrets.5
-       man/strongswan.conf.5
        src/charon-cmd/charon-cmd.8
        src/pki/man/pki.1
        src/pki/man/pki---gen.1

diff --git a/man/Makefile.am b/man/Makefile.am
index 266ef7d3a54640510912ebc37680918f22ba574f..fbc78b9aca2c584b61e3f3dc9871a2ade324cdbe 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,6 +1,5 @@
 man_MANS = \
        ipsec.conf.5 \
-       ipsec.secrets.5 \
-       strongswan.conf.5
+       ipsec.secrets.5
 
 CLEANFILES = $(man_MANS)