diff options
Diffstat (limited to 'src/ipsec')
| -rw-r--r-- | src/ipsec/Makefile.am | 2 | ||||
| -rw-r--r-- | src/ipsec/Makefile.in | 17 | ||||
| -rw-r--r-- | src/ipsec/_ipsec.8 | 8 | ||||
| -rw-r--r-- | src/ipsec/_ipsec.8.in | 8 | ||||
| -rw-r--r-- | src/ipsec/_ipsec.in | 6 |
5 files changed, 35 insertions, 6 deletions
diff --git a/src/ipsec/Makefile.am b/src/ipsec/Makefile.am index 8be28eff8..73427c0fa 100644 --- a/src/ipsec/Makefile.am +++ b/src/ipsec/Makefile.am @@ -4,6 +4,7 @@ dist_man8_MANS = _ipsec.8 EXTRA_DIST = _ipsec.in _ipsec.8.in Android.mk _ipsec.8 : _ipsec.8.in + $(AM_V_GEN) \ sed \ -e "s:@IPSEC_VERSION@:$(PACKAGE_VERSION):" \ -e "s:@IPSEC_SCRIPT@:$(ipsec_script):g" \ @@ -11,6 +12,7 @@ _ipsec.8 : _ipsec.8.in $(srcdir)/$@.in > $@ _ipsec : _ipsec.in + $(AM_V_GEN) \ sed \ -e "s:@IPSEC_SHELL@:/bin/sh:" \ -e "s:@IPSEC_VERSION@:$(PACKAGE_VERSION):" \ diff --git a/src/ipsec/Makefile.in b/src/ipsec/Makefile.in index fe65cc484..58072f20a 100644 --- a/src/ipsec/Makefile.in +++ b/src/ipsec/Makefile.in @@ -63,7 +63,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/config/libtool.m4 \ $(top_srcdir)/m4/macros/with.m4 \ $(top_srcdir)/m4/macros/enable-disable.m4 \ $(top_srcdir)/m4/macros/add-plugin.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -99,6 +99,12 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" SCRIPTS = $(sbin_SCRIPTS) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -113,6 +119,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -125,6 +132,8 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -140,6 +149,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GENHTML = @GENHTML@ GPERF = @GPERF@ GPRBUILD = @GPRBUILD@ GREP = @GREP@ @@ -148,6 +158,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -194,6 +205,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKLIB = @SOCKLIB@ STRIP = @STRIP@ +UNWINDLIB = @UNWINDLIB@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -222,6 +234,7 @@ charon_natt_port = @charon_natt_port@ charon_plugins = @charon_plugins@ charon_udp_port = @charon_udp_port@ clearsilver_LIBS = @clearsilver_LIBS@ +cmd_plugins = @cmd_plugins@ datadir = @datadir@ datarootdir = @datarootdir@ dbusservicedir = @dbusservicedir@ @@ -596,6 +609,7 @@ uninstall-man: uninstall-man8 _ipsec.8 : _ipsec.8.in + $(AM_V_GEN) \ sed \ -e "s:@IPSEC_VERSION@:$(PACKAGE_VERSION):" \ -e "s:@IPSEC_SCRIPT@:$(ipsec_script):g" \ @@ -603,6 +617,7 @@ _ipsec.8 : _ipsec.8.in $(srcdir)/$@.in > $@ _ipsec : _ipsec.in + $(AM_V_GEN) \ sed \ -e "s:@IPSEC_SHELL@:/bin/sh:" \ -e "s:@IPSEC_VERSION@:$(PACKAGE_VERSION):" \ diff --git a/src/ipsec/_ipsec.8 b/src/ipsec/_ipsec.8 index 0dbaf937b..02aeaace3 100644 --- a/src/ipsec/_ipsec.8 +++ b/src/ipsec/_ipsec.8 @@ -1,4 +1,4 @@ -.TH IPSEC 8 "2012-06-19" "5.0.4" "strongSwan" +.TH IPSEC 8 "2013-07-22" "5.1.0" "strongSwan" .SH NAME ipsec \- invoke IPsec utilities .SH SYNOPSIS @@ -259,6 +259,10 @@ returns the \fILIBEXECDIR\fP directory as defined by the configure options. .TP .B "\-\-confdir" returns the \fISYSCONFDIR\fP directory as defined by the configure options. +.PP +.TP +.B "\-\-piddir" +returns the \fIPIDDIR\fP directory as defined by the configure options. .SH FILES /usr/local/lib/ipsec usual utilities directory .SH ENVIRONMENT @@ -274,7 +278,7 @@ command sets them if they are not already set. IPSEC_DIR directory containing ipsec programs and utilities IPSEC_SBINDIR directory containing \fBipsec\fP command IPSEC_CONFDIR directory containing configuration files -IPSEC_PIDDIR directory containing PID files +IPSEC_PIDDIR directory containing PID/socket files IPSEC_SCRIPT name of the ipsec script IPSEC_NAME name of ipsec distribution IPSEC_VERSION version numer of ipsec userland and kernel diff --git a/src/ipsec/_ipsec.8.in b/src/ipsec/_ipsec.8.in index a190fa568..4cbc89686 100644 --- a/src/ipsec/_ipsec.8.in +++ b/src/ipsec/_ipsec.8.in @@ -1,4 +1,4 @@ -.TH @IPSEC_SCRIPT_UPPER@ 8 "2012-06-19" "@IPSEC_VERSION@" "strongSwan" +.TH @IPSEC_SCRIPT_UPPER@ 8 "2013-07-22" "@IPSEC_VERSION@" "strongSwan" .SH NAME @IPSEC_SCRIPT@ \- invoke IPsec utilities .SH SYNOPSIS @@ -259,6 +259,10 @@ returns the \fILIBEXECDIR\fP directory as defined by the configure options. .TP .B "\-\-confdir" returns the \fISYSCONFDIR\fP directory as defined by the configure options. +.PP +.TP +.B "\-\-piddir" +returns the \fIPIDDIR\fP directory as defined by the configure options. .SH FILES /usr/local/lib/ipsec usual utilities directory .SH ENVIRONMENT @@ -274,7 +278,7 @@ command sets them if they are not already set. IPSEC_DIR directory containing ipsec programs and utilities IPSEC_SBINDIR directory containing \fBipsec\fP command IPSEC_CONFDIR directory containing configuration files -IPSEC_PIDDIR directory containing PID files +IPSEC_PIDDIR directory containing PID/socket files IPSEC_SCRIPT name of the ipsec script IPSEC_NAME name of ipsec distribution IPSEC_VERSION version numer of ipsec userland and kernel diff --git a/src/ipsec/_ipsec.in b/src/ipsec/_ipsec.in index 3742b12c7..03ddb744d 100644 --- a/src/ipsec/_ipsec.in +++ b/src/ipsec/_ipsec.in @@ -76,7 +76,7 @@ case "$1" in echo " version" echo " stroke" echo - echo "Some of these functions have their own manual pages, e.g. ipsec_scepclient(8)." + echo "Some of these functions have their own manual pages, e.g. scepclient(8)." exit 0 ;; --versioncode) @@ -91,6 +91,10 @@ case "$1" in echo "$IPSEC_CONFDIR" exit 0 ;; +--piddir) + echo "$IPSEC_PIDDIR" + exit 0 + ;; copyright|--copyright) set _copyright # and fall through, invoking "ipsec _copyright" |