Merge branch 'feature/texinfo-fix'

4 files changed, 8 insertions, 3 deletions

diff --git a/doc/handbook/Makefile.am b/doc/handbook/Makefile.am
index d12ad1af8..8be033f23 100644
--- a/doc/handbook/Makefile.am
+++ b/doc/handbook/Makefile.am
@@ -138,7 +138,7 @@ version.texi/replacement/revert:
         @echo "@set VERSION GPACKAGE_VERSION" > gversion.texi
         @echo "@set EDITION GPACKAGE_VERSION" >> gversion.texi
 
-if SECTION7
+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
diff --git a/doc/handbook/gnunet.texi b/doc/handbook/gnunet.texi
index 05522d7d0..d688009a4 100644
--- a/doc/handbook/gnunet.texi
+++ b/doc/handbook/gnunet.texi
@@ -5,6 +5,11 @@
 @settitle GNUnet Reference Manual
 @c @exampleindent 2
 
+@c macros for backwards compatibility
+@macro geq{}
+>=
+@end macro
+
 @c Set Versions which might be used in more than one place:
 @set GNUFTP-URL https://ftp.gnu.org/gnu/gnunet
 @set PYPI-URL https://pypi.python.org/packages/source
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index d0871571d..ceb7bf68d 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -47,7 +47,7 @@ man_MANS = \
 
 EXTRA_DIST = ${man_MANS}
 
-if SECTION7
+if TEXI2MDOC_GENERATION
 EXTRA_DIST += gnunet-documentation.7 \
               gnunet-c-tutorial.7
 endif
diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am
index 0431e0684..412ac3a6f 100644
--- a/doc/tutorial/Makefile.am
+++ b/doc/tutorial/Makefile.am
@@ -88,7 +88,7 @@ version.texi/replacement/revert:
         @echo "@set VERSION GPACKAGE_VERSION" > gversion.texi
         @echo "@set EDITION GPACKAGE_VERSION" >> gversion.texi
 
-if SECTION7
+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