diff options
| -rw-r--r-- | conf/.gitignore | 1 | ||||
| -rw-r--r-- | conf/Makefile.am | 4 | ||||
| -rw-r--r-- | conf/strongswan.conf.5.in (renamed from man/strongswan.conf.5.in) | 0 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | man/Makefile.am | 3 |
5 files changed, 7 insertions, 3 deletions
diff --git a/conf/.gitignore b/conf/.gitignore index 1a3e5248a..04065fbac 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 bdab4d39a..80dffc025 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 index 02f910e6e..02f910e6e 100644 --- a/man/strongswan.conf.5.in +++ b/conf/strongswan.conf.5.in diff --git a/configure.ac b/configure.ac index cfa9b4a99..5c7cf5df2 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 266ef7d3a..fbc78b9ac 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) |