Adding the version number to the most relevant manual pages.

diff --git a/src/ipsec/Makefile.am b/src/ipsec/Makefile.am
index f3ca1ca0699c891c90b39a6cec32f2597852df14..e5c53e740b6939bddc7568c57d2aa6224256a3bb 100644 (file)
--- a/src/ipsec/Makefile.am
+++ b/src/ipsec/Makefile.am
@@ -1,7 +1,12 @@
 sbin_SCRIPTS = ipsec
-CLEANFILES = ipsec
+CLEANFILES = ipsec ipsec.8
 dist_man8_MANS = ipsec.8
-EXTRA_DIST = ipsec.in
+EXTRA_DIST = ipsec.in ipsec.8.in
+
+ipsec.8 : ipsec.8.in
+       sed \
+       -e "s:@IPSEC_VERSION@:$(PACKAGE_VERSION):" \
+       $(srcdir)/$@.in > $@
 
 ipsec : ipsec.in
        sed \

diff --git a/src/ipsec/ipsec.8 b/src/ipsec/ipsec.8.in
similarity index 99%
rename from src/ipsec/ipsec.8
rename to src/ipsec/ipsec.8.in
index fdf2ff23cec3b7b6b7f7988db8b9545ba6d482e5..24a79639206e54037b825d85c96154667da3210b 100644 (file)
--- a/src/ipsec/ipsec.8
+++ b/src/ipsec/ipsec.8.in
@@ -1,4 +1,4 @@
-.TH IPSEC 8 "2010-05-30"
+.TH IPSEC 8 "2010-05-30" "@IPSEC_VERSION@" "strongSwan"
 .SH NAME
 ipsec \- invoke IPsec utilities
 .SH SYNOPSIS

diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am
index 7ba833d2d4b1507a1d56dea5e10d55f673115e8b..098f09c579e34c1df5ef6319e85b1b95d4bda05f 100644 (file)
--- a/src/pluto/Makefile.am
+++ b/src/pluto/Makefile.am
@@ -89,7 +89,9 @@ _pluto_adns_LDADD = \
 $(LIBFREESWANDIR)/libfreeswan.a \
 -lresolv $(DLLIB)
 
+CLEANFILES = ipsec.secrets.5
 dist_man_MANS = pluto.8 ipsec.secrets.5
+EXTRA_DIST = ipsec.secrets.5.in
 
 # compile options
 #################
@@ -136,4 +138,8 @@ if USE_XAUTH
   SUBDIRS += plugins/xauth
 endif
 
+ipsec.secrets.5 : ipsec.secrets.5.in
+       sed \
+       -e "s:@IPSEC_VERSION@:$(PACKAGE_VERSION):" \
+       $(srcdir)/$@.in > $@
 

diff --git a/src/pluto/ipsec.secrets.5 b/src/pluto/ipsec.secrets.5.in
similarity index 99%
rename from src/pluto/ipsec.secrets.5
rename to src/pluto/ipsec.secrets.5.in
index 82dceac4ee23c4a90f7c123097a92a28352c2db5..adb915e4dc136210aa42a04791023515d03687b8 100644 (file)
--- a/src/pluto/ipsec.secrets.5
+++ b/src/pluto/ipsec.secrets.5.in
@@ -1,4 +1,4 @@
-.TH IPSEC.SECRETS 5 "2010-05-30"
+.TH IPSEC.SECRETS 5 "2010-05-30" "@IPSEC_VERSION@" "strongSwan"
 .SH NAME
 ipsec.secrets \- secrets for IKE/IPsec authentication
 .SH DESCRIPTION

diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
index a235013f27bd7cb55fa4aceb7450a43999a83ff3..b0941bcbdb2b1dfa96909623f69a536088bafa5e 100644 (file)
--- a/src/starter/Makefile.am
+++ b/src/starter/Makefile.am
@@ -23,8 +23,9 @@ AM_CFLAGS = \
 -DDEBUG
 
 starter_LDADD = defs.o $(top_builddir)/src/libfreeswan/libfreeswan.a $(top_builddir)/src/libstrongswan/libstrongswan.la $(SOCKLIB)
-EXTRA_DIST = parser.l parser.y keywords.txt ipsec.conf
+EXTRA_DIST = parser.l parser.y keywords.txt ipsec.conf ipsec.conf.5.in
 dist_man_MANS = ipsec.conf.5 starter.8
+CLEANFILES = ipsec.conf.5
 MAINTAINERCLEANFILES = lex.yy.c y.tab.c y.tab.h keywords.c
 
 PLUTODIR=$(top_srcdir)/src/pluto
@@ -38,6 +39,11 @@ if USE_CHARON
   AM_CFLAGS += -DSTART_CHARON
 endif
 
+ipsec.conf.5:  ipsec.conf.5.in
+               sed \
+               -e "s:@IPSEC_VERSION@:$(PACKAGE_VERSION):" \
+               $(srcdir)/$@.in > $@
+
 lex.yy.c:      $(srcdir)/parser.l $(srcdir)/parser.y $(srcdir)/parser.h y.tab.h
                $(LEX) $(srcdir)/parser.l
 

diff --git a/src/starter/ipsec.conf.5 b/src/starter/ipsec.conf.5.in
similarity index 99%
rename from src/starter/ipsec.conf.5
rename to src/starter/ipsec.conf.5.in
index 37d407fd6f7bc421822b81e53592622d0ef0fa50..c1cb9b967a884882c7108900ddb9cc673e9c1880 100644 (file)
--- a/src/starter/ipsec.conf.5
+++ b/src/starter/ipsec.conf.5.in
@@ -1,4 +1,4 @@
-.TH IPSEC.CONF 5 "2010-05-30"
+.TH IPSEC.CONF 5 "2010-05-30" "@IPSEC_VERSION@" "strongSwan"
 .SH NAME
 ipsec.conf \- IPsec configuration and connections
 .SH DESCRIPTION