simplified generation of documentation

diff --git a/cfg.mk b/cfg.mk
index 66e95f609a80c29d50ada56175481c4bec72cd5d..dc04b6d1b20be116cc0ab184ea177a7303652ae9 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -142,11 +142,11 @@ upload-tarballs:
 
 web:
        echo generating documentation for $(PACKAGE)
-       cd doc && $(SHELL) ../build-aux/gendocs.sh \
-               --html "--css-include=./texinfo.css" \
-               -o ../$(htmldir)/manual/ $(PACKAGE) "$(PACKAGE_NAME)"
-       -cd doc && make gnutls.epub && cp gnutls.epub ../$(htmldir)/manual/
+       make -C doc gnutls.html
+       cd doc && cp gnutls.html *.png ../$(htmldir)/manual/
+       cd doc && makeinfo --html --split=node -o ../$(htmldir)/manual/html_node/ --css-include=./texinfo.css gnutls.texi
        cd doc && cp *.png ../$(htmldir)/manual/html_node/
+       -cd doc && make gnutls.epub && cp gnutls.epub ../$(htmldir)/manual/
        cd doc/latex && make gnutls.pdf && cp gnutls.pdf ../../$(htmldir)/manual/
        #cd doc/doxygen && doxygen && cd ../.. && cp -v doc/doxygen/html/* $(htmldir)/devel/doxygen/ && cd doc/doxygen/latex && make refman.pdf && cd ../../../ && cp doc/doxygen/latex/refman.pdf $(htmldir)/devel/doxygen/$(PACKAGE).pdf
        -cp -v doc/reference/html/*.html doc/reference/html/*.png doc/reference/html/*.devhelp doc/reference/html/*.css $(htmldir)/reference/