Re: Regression test results on 1.7d on i686-linux: 1 failure

[Alexandre Duret-Lutz]

>>> "adl" == Alexandre Duret-Lutz <address@hidden> writes:

>>> "Dalibor" == Dalibor Topic <address@hidden> writes:
 adl> [...]

 Dalibor> I don't see it. there is main/index.html, though.

 adl> Could you try this?  (I would do it myself if Texinfo 4.1 was
 adl> still available on ftp.gnu.org, but it is not.)

I finally could put my hand on a 4.1 tarball, so I've checked
and installed this patch (resent for automake-patches@).

2003-11-24  Alexandre Duret-Lutz  <address@hidden>

        * lib/am/texibuild.am (%SOURCE_SUFFIX%.html): Work around a
        Texinfo 4.1 bug.
        Report from Dalibor Topic.

Index: THANKS
===================================================================
RCS file: /cvs/automake/automake/THANKS,v
retrieving revision 1.228
diff -u -r1.228 THANKS
--- THANKS      14 Nov 2003 21:12:26 -0000      1.228
+++ THANKS      24 Nov 2003 07:37:22 -0000
@@ -38,6 +38,7 @@
 Charles Wilson         address@hidden
 Chris Provenzano       address@hidden
 Christian Cornelssen   address@hidden
+Dalibor Topic          address@hidden
 danbp                  address@hidden
 Dave Brolley           address@hidden
 Dave Morrison          address@hidden
Index: lib/am/texibuild.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/texibuild.am,v
retrieving revision 1.19
diff -u -r1.19 texibuild.am
--- lib/am/texibuild.am 11 Nov 2003 00:07:17 -0000      1.19
+++ lib/am/texibuild.am 24 Nov 2003 07:37:22 -0000
@@ -88,6 +88,10 @@
        $(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
-- 
Alexandre Duret-Lutz