diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-15 22:17:32 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-17 09:40:08 +0200 |
| commit | 5148089bd2a5d5c800c787199d18a2791a310864 (patch) | |
| tree | f84a51f6da0c798c8dcecbde3d3728bf6d753e0c | |
| parent | 3e7a254b18e2ccb856988ac7a5ec4881043368b0 (diff) | |
| download | automake-5148089bd2a5d5c800c787199d18a2791a310864.tar.gz | |
[ng] texi: more target-specific variables use in '.info' build rules
* lib/am/texibuild.am: Rewrite '.info' targets' recipes and dependencies
to use the target-specific variable 'am__makeinfoflags', set from the
'%MAKEINFOFLAGS%' transform.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| -rw-r--r-- | lib/am/texibuild.am | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am index 11cb90a1d..349ef7ad5 100644 --- a/lib/am/texibuild.am +++ b/lib/am/texibuild.am @@ -35,7 +35,8 @@ done; \ else :; fi && \ $(if $(am__info_insrc),cd "$$am__cwd" &&) \ - if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS% -o $@ $<; \ + if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ + $(am__makeinfoflags) -o $@ $<; \ then \ rc=0; \ $(if $(am__info_insrc),$(am__cd) $(srcdir);) \ @@ -53,8 +54,8 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX% %AM_V_TEXI2DVI%$(am__ensure_target_dir_exists) && \ TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ ## 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%' \ +## if it is in srcdir (-I $(srcdir) is set in '$(am__makeinfoflags)'). + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) $(am__makeinfoflags)' \ ## texi2dvi doesn't silence everything with -q, redirect to /dev/null instead. ## We still want -q (%TEXIQUIET%) because it turns on batch mode. ## Use '--clean' to avoid leaving auxiliary files behind cluttering the build @@ -66,8 +67,8 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX% %AM_V_TEXI2PDF%$(am__ensure_target_dir_exists) && \ TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ ## 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%' \ +## if it is in srcdir (-I $(srcdir) is set in '$(am__makeinfoflags)'). + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) $(am__makeinfoflags)' \ ## texi2pdf doesn't silence everything with -q, redirect to /dev/null instead. ## We still want -q (%TEXIQUIET%) because it turns on batch mode. ## Use '--clean' to avoid leaving auxiliary files behind cluttering the build @@ -86,7 +87,7 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX% && { test ! -d $(@:.html=.htp) || rm -rf $(@:.html=.htp); } \ || exit 1; \ if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) \ - %MAKEINFOFLAGS% -o $(@:.html=.htp) $<; \ + $(am__makeinfoflags) -o $(@:.html=.htp) $<; \ then \ rm -rf $@; \ ## Work around a bug in Texinfo 4.1 (-o foo.html outputs files in foo/ @@ -105,3 +106,9 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX% %DEST_PREFIX%.dvi: %SOURCE_REAL% %DEPS% %DEST_PREFIX%.pdf: %SOURCE_REAL% %DEPS% %DEST_PREFIX%.html: %SOURCE_REAL% %DEPS% + +%DEST_INFO_PREFIX%%DEST_SUFFIX% \ +%DEST_PREFIX%.dvi \ +%DEST_PREFIX%.pdf \ +%DEST_PREFIX%.html \ +: am__makeinfoflags = %MAKEINFOFLAGS% |