[ng] texi: reorganize '.am' fragments a bit

* lib/am/texinfos.am (%.ps: %.dvi): Move ...
* lib/am/texibuild.am: ... here, which is a more appropriate place
for such a rule.
* automake.in (handle_texinfo): Drop '%AM_V_DVIPS%' when processing
'texinfos.am'; instead, use it when processing 'texibuild.am'.

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

diff --git a/automake.in b/automake.in
index 244c12bcd7369b96f43f6426acfce15b0ec478d8..00046bca185a70ff70d2c592f9e9634e149a0db7 100644 (file)
--- a/automake.in
+++ b/automake.in
@@ -3185,6 +3185,7 @@ sub handle_texinfo ()
           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",
@@ -3197,7 +3198,6 @@ sub handle_texinfo ()
 
   $output_rules .=  file_contents ('texinfos',
                                   new Automake::Location,
-                                   AM_V_DVIPS    => verbose_flag('DVIPS'),
                                   MOSTLYCLEAN   => $mostlyclean,
                                   TEXICLEAN     => $clean,
                                   MAINTCLEAN    => $maintclean,

diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index 09905d5a2a39df6c76de3dc57b1169f63066be07..ccefd0bed97930889d6df00fed72dc8ca14366f5 100644 (file)
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -101,3 +101,8 @@ define am__texi_rules_for_suffix
 endef
 
 $(foreach s,%TEXI-SUFFIXES%,$(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 $@ $<

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index fc3981a9aeb967fafba3e19b15e05ded8d5d65a4..ec8fd0911a05b05f4eafb1c517f0973f0bf61048 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -25,6 +25,7 @@ am__create_installdir = $(if $(and $1,$^),$(MKDIR_P) '$(DESTDIR)$1',@:)
 if %?LOCAL-TEXIS%
 TEXI2DVI = texi2dvi
 TEXI2PDF = $(TEXI2DVI) --pdf --batch
+DVIPS = dvips
 MAKEINFOHTML = $(MAKEINFO) --html
 AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
 endif %?LOCAL-TEXIS%
@@ -34,14 +35,6 @@ endif %?LOCAL-TEXIS%
 ## Building.  ##
 ## ---------- ##
 
-## The way to make PostScript, for those who want it.
-if %?LOCAL-TEXIS%
-DVIPS = dvips
-%.ps: %.dvi
-       %AM_V_DVIPS%TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-       $(DVIPS) %TEXIQUIET% -o $@ $<
-endif %?LOCAL-TEXIS%
-
 .PHONY: dvi dvi-am html html-am info info-am pdf pdf-am ps ps-am
 if %?SUBDIRS%
 RECURSIVE_TARGETS += dvi-recursive html-recursive info-recursive