* lib/am/texibuild.am (%SOURCE_SUFFIX%.html): Work around a

Texinfo 4.1 bug.
Report from Dalibor Topic.

diff --git a/ChangeLog b/ChangeLog
index 8e027e69c027619f678db1a35b4295d68f9fe879..1f8be76e359c2fb11de3d151f199e2b1602f7836 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-24  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * lib/am/texibuild.am (%SOURCE_SUFFIX%.html): Work around a
+       Texinfo 4.1 bug.
+       Report from Dalibor Topic.
+
 2003-11-22  Alexandre Duret-Lutz  <adl@gnu.org>
 
        Fix for PR automake/411:

diff --git a/THANKS b/THANKS
index 966beef5079843d4b04899db9c6814bc64322e7c..72743bafa2c7c2d2edded211395c0f62d8ea8ad1 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -38,6 +38,7 @@ Bruno Haible          haible@ilog.fr
 Charles Wilson         cwilson@ece.gatech.edu
 Chris Provenzano       proven@io.proven.org
 Christian Cornelssen   ccorn@cs.tu-berlin.de
+Dalibor Topic          robilad@kaffe.org
 danbp                  danpb@nospam.postmaster.co.uk
 Dave Brolley           brolley@redhat.com
 Dave Morrison          dave@bnl.gov

diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index dbb8a3cb64de8a7b33e6cb7844e8bb3853f4848f..cfb3be22069f499019c131bc64822da6d460da4d 100644 (file)
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -88,6 +88,10 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX%
        $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS% \
 ?GENERIC?       -o $@ %SOURCE%
 ?!GENERIC?      -o $@ `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+## Work around a bug in Texinfo 4.1 (-o foo.html outputs files in foo/
+## instead of foo.html/).
+       if test ! -d $@ && test -d $(@:.html=); then \
+         mv $(@:.html=) $@; else :; fi
 
 ## If we are using the generic rules, we need separate dependencies.
 ## (Don't wonder about %DIRSTAMP% here, this is used only by non-generic