Show correct path to vpnc-script in the man page

Insert the actual path to vpnc-script that is compiled into the openconnect executable. Signed-off-by: Mike Miller <mtmiller@ieee.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
sailfishos-mirror · Jun 7, 2012 · cdc8458 · cdc8458
1 parent 5583f21
commit cdc8458
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -31,7 +31,7 @@ endif
 
 pkgconfig_DATA = openconnect.pc
 
-EXTRA_DIST = version.sh openconnect.8 COPYING.LGPL
+EXTRA_DIST = version.sh COPYING.LGPL
 
 DISTCLEANFILES = $(pkgconfig_DATA)
 

diff --git a/configure.ac b/configure.ac
@@ -53,6 +53,7 @@ elif test "$with_vpnc_script" = "no"; then
 fi
 
 AC_DEFINE_UNQUOTED(DEFAULT_VPNCSCRIPT, "${with_vpnc_script}")
+AC_SUBST(DEFAULT_VPNCSCRIPT, "${with_vpnc_script}")
 
 case $host_os in
  *linux* | *gnu*)
@@ -390,4 +391,4 @@ done
 AC_SUBST(GITVERSIONDEPS)
 
 AC_OUTPUT(Makefile openconnect.pc po/Makefile www/Makefile libopenconnect.map \
-	  www/styles/Makefile www/inc/Makefile www/images/Makefile)
+	  openconnect.8 www/styles/Makefile www/inc/Makefile www/images/Makefile)
diff --git a/openconnect.8 → openconnect.8.in b/openconnect.8 → openconnect.8.in
@@ -211,9 +211,9 @@ compatible with the
 .B vpnc\-script
 which is shipped with the "vpnc" VPN client. See
 .I http://www.infradead.org/openconnect/vpnc-script.html
-for more information. Unless OpenConnect was built in a non-standard way,
-the default is
-.B /etc/vpnc/vpnc-script
+for more information. This version of OpenConnect is configured to use
+.B @DEFAULT_VPNCSCRIPT@
+by default.
 .TP
 .B \-S,\-\-script\-tun
 Pass traffic to 'script' program over a UNIX socket, instead of to a kernel

diff --git a/www/Makefile.am b/www/Makefile.am
@@ -24,7 +24,7 @@ $(START_PAGES): menu2-started.xml
 $(MAIN_PAGES): menu2.xml
 
 manual.html: openconnect.8.inc
-openconnect.8.inc: $(top_srcdir)/openconnect.8
+openconnect.8.inc: ../openconnect.8
 	groff -t -K UTF-8 -mandoc -Txhtml $? | sed -e '1,/<body>/d' -e '/<\/body>/,$$d' > $@
 
 EXTRA_DIST = $(patsubst %.html,%.xml,$(ALL_PAGES)) menu1.xml menu2*.xml html.py