#5616 - finish. fix texi2mdoc generation

diff --git a/doc/handbook/Makefile.am b/doc/handbook/Makefile.am
index 0b39ece9d8a6d651c448cf780370c9dc44e12f9b..a50a589374ac4dd1fbd089dea9475c4827a749c4 100644 (file)
--- a/doc/handbook/Makefile.am
+++ b/doc/handbook/Makefile.am
@@ -154,13 +154,6 @@ version.texi/replacement/revert:
        @echo "@set VERSION GPACKAGE_VERSION" > gversion.texi
        @echo "@set EDITION GPACKAGE_VERSION" >> gversion.texi
 
-if TEXI2MDOC_GENERATION
-gnunet-documentation.7: version.texi/replacement
-       @echo Attempting to output an mdoc formatted section 7 document
-       @texi2mdoc -I$(pwd):$(pwd)/chapters gnunet.texi > ../man/gnunet-documentation.7
-
-# TODO: (Maybe) other outputs resulting from this.
-endif
 
 # FIXME: rm *.html and *.pdf
 #doc-clean:

diff --git a/doc/man/.gitignore b/doc/man/.gitignore
index f86ff75d18a37a46dad5074b43d85cdcece6564e..38ed678729293d528cce03b60912a2746f338ba8 100644 (file)
--- a/doc/man/.gitignore
+++ b/doc/man/.gitignore
@@ -1,3 +1,5 @@
 gnunet.conf.5
 groff_lint.log
 *.html
+gnunet-c-tutorial.7
+gnunet-documentation.7

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index a88d5af0aa70259e275c19ce822c9e37ffe288ca..e739be78bc92676d07634a75691fc86b8fb0e8f7 100644 (file)
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -5,8 +5,21 @@ 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
 
+if TEXI2MDOC_GENERATION
+gnunet-c-tutorial.7: Makefile gnunet-tutorial.7
+       @echo generated texi2mdoc output
+
+gnunet-tutorial.7: Makefile
+       $(SH) $(srcdir)/texi2mdoc-generation.sh
+
+endif
+
 CLEANFILES = gnunet.conf.5 *.html
 
+if TEXI2MDOC_GENERATION
+CLEANFILES += gnunet-documentation.7 gnunet-c-tutorial.7
+endif
+
 html:
        $(SH) $(srcdir)/produce_html.sh
 
@@ -58,10 +71,14 @@ man_MANS = \
   gnunet-vpn.1 \
   gnunet-zoneimport.1
 
+if TEXI2MDOC_GENERATION
+man_MANS += gnunet-c-tutorial.7 gnunet-documentation.7
+endif
+
 EXTRA_DIST = ${man_MANS} \
- gnunet.conf.5.in
+ gnunet.conf.5.in \
+ texi2mdoc-generation.sh
 
 if TEXI2MDOC_GENERATION
-EXTRA_DIST += gnunet-documentation.7 \
-             gnunet-c-tutorial.7
+EXTRA_DIST += gnunet-documentation.7 gnunet-c-tutorial.7
 endif

diff --git a/doc/man/texi2mdoc-generation.sh b/doc/man/texi2mdoc-generation.sh
new file mode 100755 (executable)
index 0000000..b88987c
--- /dev/null
+++ b/doc/man/texi2mdoc-generation.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+# This script is in the public-domain.
+# GNUnet e.V. 2019
+#
+# Commentary: generate texi2mdoc output. This would be easier with
+# bmake / BSDmake, oh well.
+#
+# Excercise for future readers: don't fix this.
+
+# echo $(pwd)
+cd ../tutorial
+texi2mdoc -I$(pwd):$(pwd)/chapters gnunet-tutorial.texi > ../man/gnunet-c-tutorial.7
+# echo $(pwd)
+cd ../handbook
+texi2mdoc -I$(pwd):$(pwd)/chapters gnunet.texi > ../man/gnunet-documentation.7

diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am
index e76d55b8b8dd4b7595256a144b853099e97f1680..f3908aa9931ca94f034765565c60e05b286d7e97 100644 (file)
--- a/doc/tutorial/Makefile.am
+++ b/doc/tutorial/Makefile.am
@@ -93,12 +93,7 @@ version.texi/replacement/revert:
        @echo "@set VERSION GPACKAGE_VERSION" > gversion.texi
        @echo "@set EDITION GPACKAGE_VERSION" >> gversion.texi
 
-if TEXI2MDOC_GENERATION
-gnunet-tutorial.7: version.texi/replacement
-       @echo Attempting to output an mdoc formatted section 7 document
-       @texi2mdoc -I$(pwd):$(pwd)/chapters gnunet-c-tutorial.texi > ../man/gnunet-c-tutorial.7
-# TODO: (Maybe) other outputs resulting from this.
-endif
+
 
 # FIXME: rm *.html and *.pdf
 #doc-clean: