[ng] texi: reorganize '.am' fragments even more

* lib/am/texinfos.am (TEXI2DVI, TEXI2PDF, DVIPS, MAKEINFOHTML,
AM_MAKEINFOHTMLFLAGS): Move these variables' definitions ...
* lib/am/texibuild.am: ... in here, since their only uses are
here.

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

diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index ccefd0bed97930889d6df00fed72dc8ca14366f5..b86cf6dcc69faae6c1970cf339621aeb49762966 100644 (file)
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -14,6 +14,12 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+TEXI2DVI = texi2dvi
+TEXI2PDF = $(TEXI2DVI) --pdf --batch
+DVIPS = dvips
+MAKEINFOHTML = $(MAKEINFO) --html
+AM_MAKEINFOHTMLFLAGS ?= $(AM_MAKEINFOFLAGS)
+
 define am__texibuild_dvi_or_pdf
        $1$(am__ensure_target_dir_exists) && \
        TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index ec8fd0911a05b05f4eafb1c517f0973f0bf61048..867174b473780a2ed1b3461542fb428a598a1c03 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -18,18 +18,6 @@
 ## FIXME: this should probably be moved to header-vars.am ...
 am__create_installdir = $(if $(and $1,$^),$(MKDIR_P) '$(DESTDIR)$1',@:)
 
-## ----------- ##
-## Variables.  ##
-## ----------- ##
-
-if %?LOCAL-TEXIS%
-TEXI2DVI = texi2dvi
-TEXI2PDF = $(TEXI2DVI) --pdf --batch
-DVIPS = dvips
-MAKEINFOHTML = $(MAKEINFO) --html
-AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
-endif %?LOCAL-TEXIS%
-
 
 ## ---------- ##
 ## Building.  ##