[gnunet] branch master updated (953c0fde2 -> 868ad5f87)

[gnunet]

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

ng0 pushed a change to branch master
in repository gnunet.

    from 953c0fde2 gnunet-gns-proxy-setup-ca: use shlib
     new 18d272da7 man/produce_html: use shlib
     new 868ad5f87 chmod +x generated script

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 doc/man/Makefile.am                             | 11 ++++++++++-
 doc/man/{produce_html.sh => produce_html.sh.in} |  5 +----
 2 files changed, 11 insertions(+), 5 deletions(-)
 rename doc/man/{produce_html.sh => produce_html.sh.in} (71%)

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index e60d11413..601a85555 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -5,6 +5,8 @@ do_subst = $(SED) -e 's,[@]SYSCONFDIR[@],$(sysconfdir),g'
 gnunet.conf.5: gnunet.conf.5.in Makefile
        $(do_subst) < $(srcdir)/gnunet.conf.5.in > gnunet.conf.5
 
+do_subst_pkgdatadir = $(SED) -e 's,[@]pkgdatadir[@],$(pkgdatadir),g'
+
 CLEANFILES = gnunet.conf.5
 
 if TEXI2MDOC_GENERATION
@@ -25,8 +27,14 @@ if HAVE_MANDOC
 # that this is the most portable way to achieve what
 # I want and that the alternatives are depressing and
 # nonfunctional.
+produce_html.sh: produce_html.sh.in Makefile
+       $(do_subst_pkgdatadir) < $(srcdir)/produce_html.sh.in > produce_html.sh
+       @chmod +x produce_html.sh
+
+CLEANFILES += produce_html.sh
+
 .PHONY: man-html
-man-html:
+man-html: produce_html.sh
        $(SH) $(srcdir)/produce_html.sh
 
 htmldocdir = $(datadir)/doc/gnunet/manhtml/
@@ -96,4 +104,5 @@ endif
 
 EXTRA_DIST = ${man_MANS} \
  gnunet.conf.5.in \
+ produce_html.sh.in \
  README
diff --git a/doc/man/produce_html.sh b/doc/man/produce_html.sh.in
similarity index 71%
rename from doc/man/produce_html.sh
rename to doc/man/produce_html.sh.in
index ce6dea304..3f4520776 100755
--- a/doc/man/produce_html.sh
+++ b/doc/man/produce_html.sh.in
@@ -1,9 +1,6 @@
 #!/bin/sh
 
-existence()
-{
-    command -v "$1" >/dev/null 2>&1
-}
+. @pkgdatadir@/existence.sh
 
 if existence mandoc;
 then

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