aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-02-26 11:32:32 +0000
committerng0 <ng0@n0.is>2019-02-26 11:32:32 +0000
commit9537e6448b6275aa709c832080e9e05f5b3f7a47 (patch)
tree35ef5621d3427496c965971441f82de302142150
parent104d94ff02c4ee338d47bc9a51fb41ffb947a351 (diff)
downloadgnunet-9537e6448b6275aa709c832080e9e05f5b3f7a47.tar.gz
gnunet-9537e6448b6275aa709c832080e9e05f5b3f7a47.zip
doc/man: sed the sysconfdir in gnunet.conf.5
-rw-r--r--doc/man/.gitignore1
-rw-r--r--doc/man/Makefile.am11
-rw-r--r--doc/man/gnunet.conf.5.in (renamed from doc/man/gnunet.conf.5)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 @@
1# This Makefile.am is in the public domain 1# This Makefile.am is in the public domain
2
3do_subst = $(SED) -e 's,[@]SYSCONFDIR[@],$(sysconfdir),g'
4
5gnunet.conf.5: gnunet.conf.5.in Makefile
6 $(do_subst) < $(srcdir)/gnunet.conf.5.in > gnunet.conf.5
7
8CLEANFILES = gnunet.conf.5
9
2man_MANS = \ 10man_MANS = \
3 gnunet.conf.5 \ 11 gnunet.conf.5 \
4 gnunet-arm.1 \ 12 gnunet-arm.1 \
@@ -45,7 +53,8 @@ man_MANS = \
45 gnunet-vpn.1 \ 53 gnunet-vpn.1 \
46 gnunet-zoneimport.1 54 gnunet-zoneimport.1
47 55
48EXTRA_DIST = ${man_MANS} 56EXTRA_DIST = ${man_MANS} \
57 gnunet.conf.5.in
49 58
50if TEXI2MDOC_GENERATION 59if TEXI2MDOC_GENERATION
51EXTRA_DIST += gnunet-documentation.7 \ 60EXTRA_DIST += gnunet-documentation.7 \
diff --git a/doc/man/gnunet.conf.5 b/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
10The default location for the configuration file for the services is 10The default location for the configuration file for the services is
11"~gnunet/.config/gnunet.conf"; however, as normal users also may need 11"~gnunet/.config/gnunet.conf"; however, as normal users also may need
12read-access to this configuration, you might want to instead put the service 12read-access to this configuration, you might want to instead put the service
13process configuration in "/etc/gnunet.conf". 13process configuration in "@SYSCONFDIR@/gnunet.conf".
14gnunet\-setup (part of the GNUnet GTK package) can be used to edit this 14gnunet\-setup (part of the GNUnet GTK package) can be used to edit this
15configuration. The parts of GNUnet that are run as a normal user may have 15configuration. The parts of GNUnet that are run as a normal user may have
16config options too and they read from "$HOME/.config/gnunet.conf". 16config options too and they read from "$HOME/.config/gnunet.conf".