[GNUnet-SVN] [gnunet] branch master updated: doc/man: sed the sysconfdir in gnunet.conf.5

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 9537e6448 doc/man: sed the sysconfdir in gnunet.conf.5
     new b00ea4c4a Merge branch 'master' of gnunet.org:gnunet
9537e6448 is described below

commit 9537e6448b6275aa709c832080e9e05f5b3f7a47
Author: ng0 <address@hidden>
AuthorDate: Tue Feb 26 11:32:32 2019 +0000

    doc/man: sed the sysconfdir in gnunet.conf.5
---
 doc/man/.gitignore                          |  1 +
 doc/man/Makefile.am                         | 11 ++++++++++-
 doc/man/{gnunet.conf.5 => gnunet.conf.5.in} |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/doc/man/.gitignore b/doc/man/.gitignore
new file mode 100644
index 000000000..ffd69e11b
--- /dev/null
+++ b/doc/man/.gitignore
@@ -0,0 +1 @@
+gnunet.conf.5
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index ceb7bf68d..53d97b6b9 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,4 +1,12 @@
 # This Makefile.am is in the public domain
+
+do_subst = $(SED) -e 's,address@hidden@],$(sysconfdir),g'
+
+gnunet.conf.5: gnunet.conf.5.in Makefile
+       $(do_subst) < $(srcdir)/gnunet.conf.5.in > gnunet.conf.5
+
+CLEANFILES = gnunet.conf.5
+
 man_MANS = \
   gnunet.conf.5 \
   gnunet-arm.1 \
@@ -45,7 +53,8 @@ man_MANS = \
   gnunet-vpn.1 \
   gnunet-zoneimport.1
 
-EXTRA_DIST = ${man_MANS}
+EXTRA_DIST = ${man_MANS} \
+ gnunet.conf.5.in
 
 if TEXI2MDOC_GENERATION
 EXTRA_DIST += gnunet-documentation.7 \
diff --git a/doc/man/gnunet.conf.5 b/doc/man/gnunet.conf.5.in
similarity index 99%
rename from doc/man/gnunet.conf.5
rename to doc/man/gnunet.conf.5.in
index 46ea11319..560704784 100644
--- a/doc/man/gnunet.conf.5
+++ b/doc/man/gnunet.conf.5.in
@@ -10,7 +10,7 @@ A GNUnet setup typically consists of a set of service 
processes run by a user
 The default location for the configuration file for the services is
 "~gnunet/.config/gnunet.conf"; however, as normal users also may need
 read-access to this configuration, you might want to instead put the service
-process configuration in "/etc/gnunet.conf".
+process configuration in "@SYSCONFDIR@/gnunet.conf".
 gnunet\-setup (part of the GNUnet GTK package) can be used to edit this
 configuration.  The parts of GNUnet that are run as a normal user may have
 config options too and they read from "$HOME/.config/gnunet.conf".

-- 
To stop receiving notification emails like this one, please contact
address@hidden