[ng] texi: drop transforms when reading texibuild.am

They are not really needed anymore (being now completely static),
and just inlining them is simpler and clearer.

* lib/am/texibuild.am: Inline transforms ('%TEXIQUIET%',
'%TEXIDEVNULL%', '%AM_V_MAKEINFO%', '%AM_V_DVIPS%', and
'%TEXI-SUFFIXES%').
* automake.in (handle_texinfo): Simplify accordingly.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/automake.in b/automake.in
index 00046bca185a70ff70d2c592f9e9634e149a0db7..fcd0aa2c169da14912c55e9cfc2fb363db3be0af 100644 (file)
--- a/automake.in
+++ b/automake.in
@@ -3177,19 +3177,7 @@ sub handle_texinfo ()
   if ($info_texinfos)
     {
       define_verbose_texinfo;
-      # Keep this list in sync with the $infobase transform done
-      # in &handle_texinfo_helper.
-      my @valid_texinfo_suffixes = qw/texi texinfo txi/;
-      $output_verbatim .= preprocess_file (
-          "$libdir/am/texibuild.am",
-          AM_V_MAKEINFO    => verbose_flag('MAKEINFO'),
-          AM_V_TEXI2DVI    => verbose_flag('TEXI2DVI'),
-          AM_V_TEXI2PDF    => verbose_flag('TEXI2PDF'),
-          AM_V_DVIPS       => verbose_flag('DVIPS'),
-          TEXIQUIET        => verbose_flag('texinfo'),
-          TEXIDEVNULL      => verbose_flag('texidevnull'),
-          'TEXI-SUFFIXES'  => "@valid_texinfo_suffixes",
-          );
+      $output_verbatim .= preprocess_file ("$libdir/am/texibuild.am");
       ($mostlyclean, $clean, $maintclean) = handle_texinfo_helper ($info_texinfos);
       chomp $mostlyclean;
       chomp $clean;

diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index b86cf6dcc69faae6c1970cf339621aeb49762966..b8e0655731145dbf20253ef775d432ef6bf27a27 100644 (file)
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -28,11 +28,11 @@ define am__texibuild_dvi_or_pdf
        MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) $(am__makeinfoflags)' \
 ## texi2dvi and texi2pdf don't silence everything with -q, redirect to
 ## /dev/null instead.
-## We still want -q (%TEXIQUIET%) because it turns on batch mode.
+## We still want -q ($(AM_V_texinfo)) because it turns on batch mode.
 ## Use '--clean' to avoid leaving auxiliary files behind cluttering the
 ## build directory (see automake bug#11146).  We should start using
 ## '--tidy' when we can assume Texinf 4.9 or later.
-       $2 %TEXIQUIET% --clean -o $@ $< %TEXIDEVNULL%
+       $2 $(AM_V_texinfo) --clean -o $@ $< $(AM_V_texidevnull)
 endef
 
 define am__texibuild_info
@@ -45,7 +45,7 @@ define am__texibuild_info
 ## 2) If the texinfo file has some minor mistakes which cause makeinfo
 ##    to fail, the info files are not removed.  (They are needed by the
 ##    developer while he writes documentation.)
-       %AM_V_MAKEINFO%restore=: && backupdir=.am$$$$ && \
+       $(AM_V_MAKEINFO)restore=: && backupdir=.am$$$$ && \
        $(if $1,am__cwd=`pwd` && $(am__cd) $(srcdir) &&) \
        rm -rf $$backupdir && mkdir $$backupdir && \
 ## If makeinfo is not installed we must not backup the files so
@@ -71,7 +71,7 @@ define am__texibuild_info
 endef
 
 define am__texibuild_html
-       %AM_V_MAKEINFO%$(am__ensure_target_dir_exists) \
+       $(AM_V_MAKEINFO)$(am__ensure_target_dir_exists) \
 ## When --split (the default) is used, makeinfo will output a
 ## directory.  However it will not update the time stamp of a
 ## previously existing directory, and when the names of the nodes
@@ -106,9 +106,11 @@ define am__texi_rules_for_suffix
        $$(am__texibuild_html)
 endef
 
-$(foreach s,%TEXI-SUFFIXES%,$(eval $(call am__texi_rules_for_suffix,$s)))
+## Keep the list of texi suffixes in sync with the '$infobase' transform
+## done 'automake:handle_texinfo_helper()'.
+$(foreach s,txi texi texinfo,$(eval $(call am__texi_rules_for_suffix,$s)))
 
 ## The way to make PostScript, for those who want it.
 %.ps: %.dvi
-       %AM_V_DVIPS%TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-       $(DVIPS) %TEXIQUIET% -o $@ $<
+       $(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+       $(DVIPS) $(AM_V_texinfo) -o $@ $<