doc/man: Make html generation experimental, fix mdocml build.

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 82cdfc06b63cb6cee8d8c6d30f291c404374ee1a..aca26bde4bd3a92e1873e87aad52ae23e077509b 100644 (file)
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -8,15 +8,16 @@ gnunet.conf.5: gnunet.conf.5.in Makefile
 CLEANFILES = gnunet.conf.5
 
 if TEXI2MDOC_GENERATION
-gnunet-c-tutorial.7: Makefile
-       @texi2mdoc -I../tutorial:../tutorial/chapters ../tutorial/gnunet-tutorial.texi > gnunet-c-tutorial.7
+gnunet-tutorial.7: Makefile
+       @texi2mdoc -I../tutorial:../tutorial/chapters ../tutorial/tutorial.texi > gnunet-tutorial.7
 
 gnunet-documentation.7: Makefile
        @texi2mdoc -I../handbook:../handbook/chapters ../handbook/gnunet.texi > gnunet-documentation.7
 
-CLEANFILES += gnunet-documentation.7 gnunet-c-tutorial.7
+CLEANFILES += gnunet-documentation.7 gnunet-tutorial.7
 endif
 
+if HAVE_EXPERIMENTAL
 if HAVE_MANDOC
 # After I went through the alternatives with the focus
 # on staying as portable as possible to other make
@@ -38,6 +39,7 @@ man-html-uninstall:
 
 CLEANFILES += *.html
 endif
+endif
 
 man_MANS = \
   gnunet.conf.5 \
@@ -88,7 +90,7 @@ man_MANS = \
   gnunet-zoneimport.1
 
 if TEXI2MDOC_GENERATION
-man_MANS += gnunet-c-tutorial.7 gnunet-documentation.7
+man_MANS += gnunet-tutorial.7 gnunet-documentation.7
 endif
 
 EXTRA_DIST = ${man_MANS} \