From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 29 Jan 2014 12:05:07 +0000 (+0100)
Subject: conf: Generate strongswan.conf(5) man page in different directory
X-Git-Tag: 5.1.2rc1~7^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91cc523ca78e73050c94ccc30cf9943419486d11;p=thirdparty%2Fstrongswan.git

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

diff --git a/conf/.gitignore b/conf/.gitignore
index 1a3e5248ad..04065fbac6 100644
--- 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 bdab4d39a3..80dffc0259 100644
--- 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 cfa9b4a992..5c7cf5df28 100644
--- 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 266ef7d3a5..fbc78b9aca 100644
--- 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)