For automake/354:

* lib/am/texibuild.am (%SOURCE_SUFFIX%.dvi, %SOURCE_SUFFIX%.pdf):
Don't use `-o' unless necessary.

diff --git a/ChangeLog b/ChangeLog
index a04286b12f81a40b87c5a24347b76f2a9a7769c2..27216a62c276b7963cd7937fa96e2bfb28059bb3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-04  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       For automake/354:
+       * lib/am/texibuild.am (%SOURCE_SUFFIX%.dvi, %SOURCE_SUFFIX%.pdf):
+       Don't use `-o' unless necessary.
+
 2002-08-25  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        For PR automake/343:

diff --git a/Makefile.in b/Makefile.in
index bfcfed3de56fe9b031bd0a3a06b79dd442035285..a1fc912ff35852b0739b663927233faf744840fa 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -186,12 +186,12 @@ uninstall-binSCRIPTS:
 .texi.dvi:
        TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
        MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-       $(TEXI2DVI) `test -f '$<' || echo '$(srcdir)/'`$< -o $@
+       $(TEXI2DVI) `test -f '$<' || echo '$(srcdir)/'`$<
 
 .texi.pdf:
        TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
        MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-       $(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$< -o $@
+       $(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
 automake.info: version.texi
 automake.dvi: version.texi
 automake.pdf: version.texi

diff --git a/NEWS b/NEWS
index 9663aef7ee4689180747829ad54bca097d3c893d..9aa1c667adf73b756f1b58ca7b59c64d8d40caba 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,7 +17,8 @@ New in 1.6c:
   when `make installcheck' is run.  This is enabled by --gnits.
 * Texinfo rules now support the `ps' and `pdf' targets.
 * Info files are now created in the build directory, not the source directory.
-* info_TEXINFOS supports files in subdirectories.
+* info_TEXINFOS supports files in subdirectories (this requires Texinfo 4.1
+  or greater).
 * `make distcheck' will enforce DESTDIR support by attempting
   a DESTDIR install.
 * `+=' can be used in conditionals, even if the augmented variable

diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index a834f49955ca152daeb855e465373c76c501a2ed..e13689384a9f971754a8f20d98f6f01359c6024e 100644 (file)
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -39,7 +39,9 @@
 ## Must set MAKEINFO like this so that version.texi will be found even
 ## if it is in srcdir (-I $(srcdir) is set in %MAKEINFOFLAGS%).
        MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS%' \
-       $(TEXI2DVI) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% -o $@
+## Do not use `-o' unless necessary: it is only supported since Texinfo 4.1.
+?GENERIC?      $(TEXI2DVI) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+?!GENERIC?     $(TEXI2DVI) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% -o $@
 
 ?GENERIC?%SOURCE_SUFFIX%.pdf:
 ?!GENERIC?%DEST_PREFIX%.pdf: %SOURCE% %DEPS% %DIRSTAMP%
@@ -47,7 +49,9 @@
 ## Must set MAKEINFO like this so that version.texi will be found even
 ## if it is in srcdir (-I $(srcdir) is set in %MAKEINFOFLAGS%).
        MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS%' \
-       $(TEXI2PDF) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% -o $@
+## Do not use `-o' unless necessary: it is only supported since Texinfo 4.1.
+?GENERIC?      $(TEXI2PDF) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+?!GENERIC?     $(TEXI2PDF) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% -o $@
 
 ## If we are using the generic rules, we need separate dependencies.
 ## (Don't wonder about %DIRSTAMP% here, this is used only by non-generic