* automake.in (output_texinfo_build_rules): Define %SOURCE_REAL%.

* lib/am/texibuild.am (%DEST_PREFIX%%DEST_SUFFIX%,
%DEST_PREFIX%.dvi, %DEST_PREFIX%.pdf): Add %SOURCE_REAL% as dependency.

diff --git a/ChangeLog b/ChangeLog
index f2bfcfd117df0986762fb2d47b86afc093f93aa1..a1a2b2b92b82051e1fd26f87f6fc4dae0a071bca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-25  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * automake.in (output_texinfo_build_rules): Define %SOURCE_REAL%.
+       * lib/am/texibuild.am (%DEST_PREFIX%%DEST_SUFFIX%,
+       %DEST_PREFIX%.dvi, %DEST_PREFIX%.pdf): Add %SOURCE_REAL% as dependency.
+
 2002-09-24  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
        * lib/am/ltlib.am (clean-%DIR%LTLIBRARIES): Use $$dir in make

diff --git a/Makefile.in b/Makefile.in
index 5945672b0ada606dff42c4e37fc7c93e33b594fc..210b674cc1ff4fcad090971a74c2dc5ff171564c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -208,9 +208,9 @@ uninstall-binSCRIPTS:
        TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
        MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
        $(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
-automake.info: version.texi
-automake.dvi: version.texi
-automake.pdf: version.texi
+automake.info: automake.texi version.texi
+automake.dvi: automake.texi version.texi
+automake.pdf: automake.texi version.texi
 version.texi:  stamp-vti
 stamp-vti: automake.texi $(top_srcdir)/configure.in
        @(dir=.; test -f ./automake.texi || dir=$(srcdir); \

diff --git a/automake.in b/automake.in
index 270f1491ca6283fc22935abaa239cc27436a01a3..05005ff2a9bcb2785d903d8a6b982641f6f85171 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3632,6 +3632,7 @@ sub output_texinfo_build_rules ($$@)
                                    GENERIC       => $generic,
                                    SOURCE_SUFFIX => $ssfx,
                                    SOURCE => ($generic ? '$<' : $source),
+                                   SOURCE_REAL   => $source,
                                    DEST_PREFIX   => $dpfx,
                                    DEST_SUFFIX   => $dsfx,
                                    MAKEINFOFLAGS => $makeinfoflags,

diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index aeac0884e7666cf312c580546e8acf77e94ac964..cc1743c6d18d47d02f0ad18e9dfcde96c8a54fcc 100644 (file)
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -57,7 +57,7 @@
 ## (Don't wonder about %DIRSTAMP% here, this is used only by non-generic
 ## rules.)
 if %?GENERIC%
-%DEST_PREFIX%%DEST_SUFFIX%: %DEPS%
-%DEST_PREFIX%.dvi: %DEPS%
-%DEST_PREFIX%.pdf: %DEPS%
+%DEST_PREFIX%%DEST_SUFFIX%: %SOURCE_REAL% %DEPS%
+%DEST_PREFIX%.dvi: %SOURCE_REAL% %DEPS%
+%DEST_PREFIX%.pdf: %SOURCE_REAL% %DEPS%
 endif %?GENERIC%