diff options
author | Werner Koch <[email protected]> | 2015-06-09 19:29:15 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2015-06-09 19:29:15 +0000 |
commit | 25331bba5554a39d226d32433add7784b2e170b8 (patch) | |
tree | 4c8e4d1335407bdab98c4a7584fa2b95375457ca /doc/scdaemon.texi | |
parent | dirmngr: Avoid crash due to an empty crls.d/DIR.txt. (diff) | |
download | gnupg-25331bba5554a39d226d32433add7784b2e170b8.tar.gz gnupg-25331bba5554a39d226d32433add7784b2e170b8.zip |
doc: Do not used fixed file names in the manuals.
* doc/mkdefsinc.c: New.
* doc/Makefile.am: Include cmacros.am.
(EXTRA_DIST): Add mkdefsinc.c defsincdate.
(BUILT_SOURCES): Add defsincdate
(CLEANFILES): Add mkdefsinc and defs.inc.
(mkdefsinc): New rule.
(yat2m-stamp): Depend on defs.inc.
($(myman_pages) gnupg.7): Ditto.
(gnupg.texi): Remove rule to touch itself.
(dist-hook): New.
(defsincdate): New.
(defs.inc): New.
* doc/gnupg.texi: Remove inclusion of version.texi. Include defs.inc.
Also include defs.inc in all files used to build man files. Change
fixed directory names to those from defs.inc.
--
GnuPG-bug-id: 1661
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'doc/scdaemon.texi')
-rw-r--r-- | doc/scdaemon.texi | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi index 79a5fccd5..7f1058bd8 100644 --- a/doc/scdaemon.texi +++ b/doc/scdaemon.texi @@ -2,6 +2,8 @@ @c This is part of the GnuPG manual. @c For copying conditions, see the file gnupg.texi. +@include defs.inc + @node Invoking SCDAEMON @chapter Invoking the SCDAEMON @cindex SCDAEMON command options @@ -469,8 +471,8 @@ make much sense expect for system services, but in this case no regular user accounts are hosted on the machine. A client connects to the SC-Daemon by connecting to the socket named -@file{/var/run/scdaemon/socket}, configuration information is read from -@var{/etc/scdaemon.conf} +@file{@value{LOCALRUNDIR}/scdaemon/socket}, configuration information +is read from @var{@value{SYSCONFDIR}/scdaemon.conf} Each connection acts as one session, SC-Daemon takes care of synchronizing access to a token between sessions. |