the new makeinfo sets the FLOAT_NAME by default.

diff --git a/cfg.mk b/cfg.mk
index 0ead812106ecf147a18f9205107acf33e98a9a10..a84f77239f40bcbcf2975907143318bf0532c94e 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -143,7 +143,7 @@ upload:
 web:
        echo generating documentation for $(PACKAGE)
        cd doc && $(SHELL) ../build-aux/gendocs.sh \
-               --html "--css-include=./texinfo.css --set FLOAT_NAME_IN_XREF=1" \
+               --html "--css-include=./texinfo.css" \
                -o ../$(htmldir)/manual/ $(PACKAGE) "$(PACKAGE_NAME)"
        -cd doc && make gnutls.epub && cp gnutls.epub ../$(htmldir)/manual/
        cd doc && cp *.png ../$(htmldir)/manual/html_node/

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6c36ae4813e05a77d25e5f6ec9dc41f24de603cf..7f1fde909075a238e67f00e9b1c35685b858d98c 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -182,7 +182,7 @@ images_DATA = \
 AM_MAKEINFOFLAGS = -I $(top_srcdir)/doc
 TEXI2DVI = texi2dvi $(AM_MAKEINFOFLAGS)
 AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) \
-       --set FLOAT_NAME_IN_XREF=1 --no-split --css-include=$(srcdir)/texinfo.css
+       --no-split --css-include=$(srcdir)/texinfo.css
 
 MAINTAINERCLEANFILES =