diff options
author | ng0 <ng0@n0.is> | 2019-02-26 11:32:32 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-02-26 11:32:32 +0000 |
commit | 9537e6448b6275aa709c832080e9e05f5b3f7a47 (patch) | |
tree | 35ef5621d3427496c965971441f82de302142150 | |
parent | 104d94ff02c4ee338d47bc9a51fb41ffb947a351 (diff) | |
download | gnunet-9537e6448b6275aa709c832080e9e05f5b3f7a47.tar.gz gnunet-9537e6448b6275aa709c832080e9e05f5b3f7a47.zip |
doc/man: sed the sysconfdir in gnunet.conf.5
-rw-r--r-- | doc/man/.gitignore | 1 | ||||
-rw-r--r-- | doc/man/Makefile.am | 11 | ||||
-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 | |||
3 | do_subst = $(SED) -e 's,[@]SYSCONFDIR[@],$(sysconfdir),g' | ||
4 | |||
5 | gnunet.conf.5: gnunet.conf.5.in Makefile | ||
6 | $(do_subst) < $(srcdir)/gnunet.conf.5.in > gnunet.conf.5 | ||
7 | |||
8 | CLEANFILES = gnunet.conf.5 | ||
9 | |||
2 | man_MANS = \ | 10 | man_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 | ||
48 | EXTRA_DIST = ${man_MANS} | 56 | EXTRA_DIST = ${man_MANS} \ |
57 | gnunet.conf.5.in | ||
49 | 58 | ||
50 | if TEXI2MDOC_GENERATION | 59 | if TEXI2MDOC_GENERATION |
51 | EXTRA_DIST += gnunet-documentation.7 \ | 60 | EXTRA_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 | |||
10 | The default location for the configuration file for the services is | 10 | The 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 |
12 | read-access to this configuration, you might want to instead put the service | 12 | read-access to this configuration, you might want to instead put the service |
13 | process configuration in "/etc/gnunet.conf". | 13 | process configuration in "@SYSCONFDIR@/gnunet.conf". |
14 | gnunet\-setup (part of the GNUnet GTK package) can be used to edit this | 14 | gnunet\-setup (part of the GNUnet GTK package) can be used to edit this |
15 | configuration. The parts of GNUnet that are run as a normal user may have | 15 | configuration. The parts of GNUnet that are run as a normal user may have |
16 | config options too and they read from "$HOME/.config/gnunet.conf". | 16 | config options too and they read from "$HOME/.config/gnunet.conf". |