Build generated man pages via configure script

diff --git a/configure.ac b/configure.ac
index 9469ddbb7af4f2932b56d7edaab6c71e9c751495..768cb87d17a3f4c9ddc343231e2ffe3baeaeee44 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1482,6 +1482,18 @@ AC_CONFIG_FILES([
        scripts/Makefile
        testing/Makefile
 ])
+
+# =================
+#  build man pages
+# =================
+
+AC_CONFIG_FILES([
+       man/ipsec.conf.5
+       man/ipsec.secrets.5
+       man/strongswan.conf.5
+       src/charon-cmd/charon-cmd.8
+])
+
 AC_OUTPUT
 
 # ========================

diff --git a/man/.gitignore b/man/.gitignore
index 2767ce80f758887997ea7317a906004f9b3418ed..5d06cd46646e1410ac9d26a5e90e12da4ae85f29 100644 (file)
--- a/man/.gitignore
+++ b/man/.gitignore
@@ -1,3 +1 @@
-ipsec.conf.5
-ipsec.secrets.5
-strongswan.conf.5
+*.5

diff --git a/man/Makefile.am b/man/Makefile.am
index 0becd24c7c74917acfd5e5a6da393acf1515d13a..266ef7d3a54640510912ebc37680918f22ba574f 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,13 +1,6 @@
-dist_man_MANS = ipsec.conf.5 ipsec.secrets.5 strongswan.conf.5
-EXTRA_DIST = ipsec.conf.5.in ipsec.secrets.5.in strongswan.conf.5.in
-CLEANFILES = ipsec.conf.5 ipsec.secrets.5 strongswan.conf.5
+man_MANS = \
+       ipsec.conf.5 \
+       ipsec.secrets.5 \
+       strongswan.conf.5
 
-SUFFIXES = .in
-
-.in:
-       $(AM_V_GEN) \
-       sed \
-       -e "s:@IPSEC_VERSION@:$(PACKAGE_VERSION):" \
-       -e "s:@DEV_URANDOM@:$(urandom_device):" \
-       -e "s:@DEV_RANDOM@:$(random_device):" \
-       $(srcdir)/$@.in > $@
+CLEANFILES = $(man_MANS)

diff --git a/man/ipsec.conf.5.in b/man/ipsec.conf.5.in
index b851729230fc20c551b9650f8fe04cde313934b6..a62d68aaee4e9cd38a1a13aebd6738060c4b98ee 100644 (file)
--- a/man/ipsec.conf.5.in
+++ b/man/ipsec.conf.5.in
@@ -1,4 +1,4 @@
-.TH IPSEC.CONF 5 "2012-06-26" "@IPSEC_VERSION@" "strongSwan"
+.TH IPSEC.CONF 5 "2012-06-26" "@PACKAGE_VERSION@" "strongSwan"
 .SH NAME
 ipsec.conf \- IPsec configuration and connections
 .SH DESCRIPTION

diff --git a/man/ipsec.secrets.5.in b/man/ipsec.secrets.5.in
index ee20c9670dfef905ee0e1572b317584ccee522af..15e36faff30ff50cbdc3cbe1793feeef46d7e880 100644 (file)
--- a/man/ipsec.secrets.5.in
+++ b/man/ipsec.secrets.5.in
@@ -1,4 +1,4 @@
-.TH IPSEC.SECRETS 5 "2011-12-14" "@IPSEC_VERSION@" "strongSwan"
+.TH IPSEC.SECRETS 5 "2011-12-14" "@PACKAGE_VERSION@" "strongSwan"
 .SH NAME
 ipsec.secrets \- secrets for IKE/IPsec authentication
 .SH DESCRIPTION

diff --git a/man/strongswan.conf.5.in b/man/strongswan.conf.5.in
index 3ccc438676a18984df9a47a1422b3917bb7f2156..a509bd004cf2a5ee16a00612ba6b6c3d99af2cf9 100644 (file)
--- a/man/strongswan.conf.5.in
+++ b/man/strongswan.conf.5.in
@@ -1,4 +1,4 @@
-.TH STRONGSWAN.CONF 5 "2013-07-22" "@IPSEC_VERSION@" "strongSwan"
+.TH STRONGSWAN.CONF 5 "2013-07-22" "@PACKAGE_VERSION@" "strongSwan"
 .SH NAME
 strongswan.conf \- strongSwan configuration file
 .SH DESCRIPTION
@@ -852,11 +852,11 @@ keys not stored on tokens
 .BR libstrongswan.plugins.pkcs11.use_rng " [no]"
 Whether the PKCS#11 modules should be used as RNG
 .TP
-.BR libstrongswan.plugins.random.random " [@DEV_RANDOM@]"
-File to read random bytes from, instead of @DEV_RANDOM@
+.BR libstrongswan.plugins.random.random " [@random_device@]"
+File to read random bytes from, instead of @random_device@
 .TP
-.BR libstrongswan.plugins.random.urandom " [@DEV_URANDOM@]"
-File to read pseudo random bytes from, instead of @DEV_URANDOM@
+.BR libstrongswan.plugins.random.urandom " [@urandom_device@]"
+File to read pseudo random bytes from, instead of @urandom_device@
 .TP
 .BR libstrongswan.plugins.unbound.resolv_conf " [/etc/resolv.conf]"
 File to read DNS resolver configuration from
@@ -970,7 +970,7 @@ Send open listening ports without being prompted
 .BR libimcv.plugins.imv-scanner.remediation_uri
 URI pointing to scanner remediation instructions
 .TP
-.BR libimcv.plugins.imc-swid.swid_directory "[$(prefix)/share]"
+.BR libimcv.plugins.imc-swid.swid_directory " [@prefix@/share]"
 Directory where SWID tags are located
 .TP
 .BR libimcv.plugins.imc-test.additional_ids " [0]"

diff --git a/src/charon-cmd/Makefile.am b/src/charon-cmd/Makefile.am
index 9ed82be5edd9260a8e6595bce43cf081bc9c9d3b..73df450721c540e92212348838cdbd3753f1e6ea 100644 (file)
--- a/src/charon-cmd/Makefile.am
+++ b/src/charon-cmd/Makefile.am
@@ -1,7 +1,6 @@
 sbin_PROGRAMS = charon-cmd
-CLEANFILES = charon-cmd.8
-dist_man8_MANS = charon-cmd.8
-EXTRA_DIST = charon-cmd.8.in
+man8_MANS = charon-cmd.8
+CLEANFILES = $(man8_MANS)
 
 charon_cmd_SOURCES = \
        cmd/cmd_options.h cmd/cmd_options.c \
@@ -24,9 +23,3 @@ charon_cmd_LDADD = \
        $(top_builddir)/src/libhydra/libhydra.la \
        $(top_builddir)/src/libcharon/libcharon.la \
        -lm $(PTHREADLIB) $(DLLIB)
-
-charon-cmd.8 : charon-cmd.8.in
-       $(AM_V_GEN) \
-       sed \
-       -e "s:@IPSEC_VERSION@:$(PACKAGE_VERSION):" \
-       $(srcdir)/$@.in > $@

diff --git a/src/charon-cmd/charon-cmd.8.in b/src/charon-cmd/charon-cmd.8.in
index c9d52c92f0c38c65abccabcdcb6ea3b174071e9c..25d706995e20e894220db3e987e5478c5ab2be49 100644 (file)
--- a/src/charon-cmd/charon-cmd.8.in
+++ b/src/charon-cmd/charon-cmd.8.in
@@ -1,4 +1,4 @@
-.TH CHARON\-CMD 8 "2013-06-21" "@IPSEC_VERSION@" "strongSwan"
+.TH CHARON\-CMD 8 "2013-06-21" "@PACKAGE_VERSION@" "strongSwan"
 .SH "NAME"
 charon\-cmd \- Simple IKE client (IPsec VPN client)
 .SH SYNOPSIS