[ng] texi: remove workaround for Texinfo 4.1

* lib/am/texibuild.mk (am.texi.build.html): Here.  We require
Texinfo >= 4.9 anyway.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/lib/am/texibuild.mk b/lib/am/texibuild.mk
index 0687201e0442bd2e54059d0d44ad360057fd7541..1669e309bdb2fb48084d61cb24e210b4c47bba06 100644 (file)
--- a/lib/am/texibuild.mk
+++ b/lib/am/texibuild.mk
@@ -91,13 +91,9 @@ define am.texi.build.html
                            -o $(@:.html=.htp) $<; \
        then \
          rm -rf $@; \
-## Work around a bug in Texinfo 4.1 (-o foo.html outputs files in foo/
-## instead of foo.html/).
-         if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-           mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
+         mv $(@:.html=.htp) $@; \
        else \
-         if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-           rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
+         rm -rf $(@:.html=.htp) $@; \
          exit 1; \
        fi
 endef