Insert the actual path to vpnc-script that is compiled into the
openconnect executable.
Signed-off-by: Mike Miller <mtmiller at ieee.org>
---
Sorry, here's a more readable version of the patch I just sent...
Makefile.am | 2 +-
configure.ac | 3 ++-
openconnect.8 => openconnect.8.in | 6 +++---
3 files changed, 6 insertions(+), 5 deletions(-)
rename openconnect.8 => openconnect.8.in (98%)
diff --git a/Makefile.am b/Makefile.am
index 62eaf1e..e9e24e2 100644
--- 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
index 61b21e3..c1bb531 100644
--- 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 b/openconnect.8.in
similarity index 98%
rename from openconnect.8
rename to openconnect.8.in
index bb47b38..97b183e 100644
--- a/openconnect.8
+++ b/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
--
1.7.10
