From b02f67b0e5a4d571119455f6fab0d8ac1a6e6fad Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Wed, 4 Sep 2002 22:08:33 +0000 Subject: [PATCH] For automake/354: * lib/am/texibuild.am (%SOURCE_SUFFIX%.dvi, %SOURCE_SUFFIX%.pdf): Don't use `-o' unless necessary. --- ChangeLog | 6 ++++++ Makefile.in | 4 ++-- NEWS | 3 ++- lib/am/texibuild.am | 8 ++++++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a04286b1..27216a62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-09-04 Alexandre Duret-Lutz + + 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 For PR automake/343: diff --git a/Makefile.in b/Makefile.in index bfcfed3d..a1fc912f 100644 --- 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 9663aef7..9aa1c667 100644 --- 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 a834f499..e1368938 100644 --- 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 -- 2.43.5