From 18ac3c804523f2a8047b45aa4199b67f16cbfdb6 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sat, 16 Jun 2012 11:35:47 +0200 Subject: [PATCH] [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 --- lib/am/texibuild.am | 6 ++++++ lib/am/texinfos.am | 12 ------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am index ccefd0bed..b86cf6dcc 100644 --- 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 . +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 ec8fd0911..867174b47 100644 --- 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. ## -- 2.47.2