From 778cdcea215d6d2d3eeb9d4930c4122e997c94ad Mon Sep 17 00:00:00 2001 From: frankmorgner Date: Fri, 2 Mar 2012 10:55:43 +0000 Subject: [PATCH] added recommended configure options to documentation git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@727 96b47cad-a561-4643-ad3b-153ac7d7599c --- ccid/doc/Makefile.am | 1 + doc/autotools.rst.in | 2 +- npa/doc/Makefile.am | 1 + npa/doc/README.rst | 2 ++ pcsc-relay/doc/Makefile.am | 1 + virtualsmartcard/doc/Makefile.am | 1 + virtualsmartcard/doc/autotools.rst | 2 +- 7 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ccid/doc/Makefile.am b/ccid/doc/Makefile.am index 99f10ad..e4374b0 100644 --- a/ccid/doc/Makefile.am +++ b/ccid/doc/Makefile.am @@ -4,6 +4,7 @@ do_subst = sed \ -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \ -e 's,[@]PACKAGE_URL[@],$(PACKAGE_URL),g' \ -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \ + -e 's,[@]RECOMMENDED_CONF_OPTS[@],,g' \ -e 's,[@]builddir[@],$(builddir),g' \ -e 's,[@]prefix[@],$(prefix),g' \ -e 's,[@]exec_prefix[@],$(exec_prefix),g' \ diff --git a/doc/autotools.rst.in b/doc/autotools.rst.in index 253b61c..eb629dc 100644 --- a/doc/autotools.rst.in +++ b/doc/autotools.rst.in @@ -15,6 +15,6 @@ get the missing standard auxiliary files:: To configure (:command:`configure --help` lists possible options), build and install the @PACKAGE_NAME@ now do the following:: - ./configure + ./configure@RECOMMENDED_CONF_OPTS@ make make install diff --git a/npa/doc/Makefile.am b/npa/doc/Makefile.am index 8d3d9a5..e3bab45 100644 --- a/npa/doc/Makefile.am +++ b/npa/doc/Makefile.am @@ -6,6 +6,7 @@ do_subst = sed \ -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \ -e 's,[@]PACKAGE_URL[@],$(PACKAGE_URL),g' \ -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \ + -e 's,[@]RECOMMENDED_CONF_OPTS[@],,g' \ -e 's,[@]builddir[@],$(builddir),g' \ -e 's,[@]prefix[@],$(prefix),g' \ -e 's,[@]exec_prefix[@],$(exec_prefix),g' \ diff --git a/npa/doc/README.rst b/npa/doc/README.rst index 1c627cc..82a6e6d 100644 --- a/npa/doc/README.rst +++ b/npa/doc/README.rst @@ -32,6 +32,8 @@ Establishment (PACE). npa-tool can be used for PIN management or to encrypt APDUs inside a secure messaging channel established with PACE. +.. _npa-install: + .. include:: autotools.rst The nPA Smart Card Library has the following dependencies: diff --git a/pcsc-relay/doc/Makefile.am b/pcsc-relay/doc/Makefile.am index ad0a7db..bc13502 100644 --- a/pcsc-relay/doc/Makefile.am +++ b/pcsc-relay/doc/Makefile.am @@ -4,6 +4,7 @@ do_subst = sed \ -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \ -e 's,[@]PACKAGE_URL[@],$(PACKAGE_URL),g' \ -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \ + -e 's,[@]RECOMMENDED_CONF_OPTS[@],,g' \ -e 's,[@]builddir[@],$(builddir),g' \ -e 's,[@]prefix[@],$(prefix),g' \ -e 's,[@]exec_prefix[@],$(exec_prefix),g' \ diff --git a/virtualsmartcard/doc/Makefile.am b/virtualsmartcard/doc/Makefile.am index 89d2b80..77601cd 100644 --- a/virtualsmartcard/doc/Makefile.am +++ b/virtualsmartcard/doc/Makefile.am @@ -6,6 +6,7 @@ do_subst = sed \ -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \ -e 's,[@]PACKAGE_URL[@],$(PACKAGE_URL),g' \ -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \ + -e 's,[@]RECOMMENDED_CONF_OPTS[@], --sysconfdir=/etc,g' \ -e 's,[@]builddir[@],$(builddir),g' \ -e 's,[@]prefix[@],$(prefix),g' \ -e 's,[@]exec_prefix[@],$(exec_prefix),g' \ diff --git a/virtualsmartcard/doc/autotools.rst b/virtualsmartcard/doc/autotools.rst index 9007ecd..d87fc78 100644 --- a/virtualsmartcard/doc/autotools.rst +++ b/virtualsmartcard/doc/autotools.rst @@ -15,6 +15,6 @@ get the missing standard auxiliary files:: To configure (:command:`configure --help` lists possible options), build and install the Virtual Smart Card now do the following:: - ./configure + ./configure --sysconfdir=/etc make make install