summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/support/latex-make
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-10-17 20:39:55 +0000
committerKarl Berry <karl@freefriends.org>2018-10-17 20:39:55 +0000
commitc4b3fe8be2d6c5e856eb3629430e2e177fd7c2db (patch)
treef69d22a2e6560326dfcfbbd3deec69d3b61c550d /Master/texmf-dist/doc/support/latex-make
parentf5112bd8d60b74a14f806899d414c8142393529d (diff)
latex-make (17oct18)
git-svn-id: svn://tug.org/texlive/trunk@48925 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/support/latex-make')
-rw-r--r--Master/texmf-dist/doc/support/latex-make/LaTeX.mk79
-rw-r--r--Master/texmf-dist/doc/support/latex-make/README2
-rw-r--r--Master/texmf-dist/doc/support/latex-make/figlatex.pdfbin224943 -> 224481 bytes
-rw-r--r--Master/texmf-dist/doc/support/latex-make/latex-make.pdfbin341218 -> 345142 bytes
-rw-r--r--Master/texmf-dist/doc/support/latex-make/texdepends.pdfbin262023 -> 262731 bytes
5 files changed, 47 insertions, 34 deletions
diff --git a/Master/texmf-dist/doc/support/latex-make/LaTeX.mk b/Master/texmf-dist/doc/support/latex-make/LaTeX.mk
index ddd8310413b..5167a742b1b 100644
--- a/Master/texmf-dist/doc/support/latex-make/LaTeX.mk
+++ b/Master/texmf-dist/doc/support/latex-make/LaTeX.mk
@@ -410,19 +410,36 @@ $(eval $(call lu-setvar-global,FIG2DEV,fig2dev))
$(eval $(call lu-setvar-global,EPSTOPDF,epstopdf))
$(eval $(call lu-setvar-global,MAKEINDEX,makeindex))
-# Look for local version, then texmfscript, then in PATH of our program
+# workaround the fact that $(shell ...) ignore locally exported variables
+# get only the variables with plain names
+_LU_MAKE_ENV := $(shell echo '$(.VARIABLES)' | awk -v RS=' ' '/^[a-zA-Z0-9]+$$/')
+_LU_SHELL_EXPORT := $(foreach v,$(_LU_MAKE_ENV),$(v)='$($(v))')
+_lu_run_kpsewhich=$(shell $(_LU_SHELL_EXPORT) kpsewhich -format $1 $2)
+
+# Look first into the TDS (texmfscripts), then in PATH for our program
# At each location, we prefer with suffix than without
define _lu_which # VARNAME progname
ifeq ($(origin _LU_$(1)_DEFAULT), undefined)
_LU_$(1)_DEFAULT := $$(firstword $$(wildcard \
- $$(addprefix bin/,$(2) $$(basename $(2))) \
- $$(addprefix ./,$(2) $$(basename $(2))) \
- $$(shell kpsewhich -format texmfscripts $(2)) \
- $$(shell kpsewhich -format texmfscripts $$(basename $(2))) \
+ $$(call _lu_run_kpsewhich,texmfscripts,$(2)) \
+ $$(call _lu_run_kpsewhich,texmfscripts,$$(basename $(2))) \
$$(foreach dir,$$(subst :, ,$$(PATH)), \
$$(dir)/$(2) $$(dir)/$$(basename $(2))) \
) $(2))
export _LU_$(1)_DEFAULT
+ _LU_$(1)_DEFAULT_OLD := $$(firstword $$(wildcard \
+ $$(addprefix bin/,$(2) $$(basename $(2))) \
+ $$(addprefix ./,$(2) $$(basename $(2)))))
+ $$(if $$(filter-out $$(_LU_$(1)_DEFAULT), $$(_LU_$(1)_DEFAULT_OLD)),\
+ $$(if $$(_lu_scripts_warnings),, \
+ $$(eval _lu_scripts_warnings:=done) \
+ $$(warning By default, this version of LaTeX-Make do not use \
+ scripts in $$(dir $$(_LU_$(1)_DEFAULT_OLD)) anymore.) \
+ $$(warning For example $$(_LU_$(1)_DEFAULT) is used instead of $$(_LU_$(1)_DEFAULT_OLD))\
+ $$(warning If you want to keep the old behavior, add into your \
+ Makefile something like:)\
+ $$(warning export TEXMFSCRIPTS:=$$(dir $$(_LU_$(1)_DEFAULT_OLD))$$$$(addprefix :,$$$$(TEXMFSCRIPTS))::)))
+ #$$(warning _LU_$(1)_DEFAULT=$$(_LU_$(1)_DEFAULT))
endif
$$(eval $$(call lu-setvar-global,$(1),$$(_LU_$(1)_DEFAULT)))
endef
@@ -660,8 +677,9 @@ define lu-master-texflavor-rules # MASTER FLAVOR ext(.dvi/.pdf)
$$(sort $$(call lu-getvalues,BIBFILES,$(1),$(2)) \
$$(wildcard $$(call lu-getvalues,BIBSTYLES,$(1),$(2))))
$(1)$(3): %$(3): \
- $$(call lu-getvalues,DEPENDS,$(1),$(2)) \
- $$(call lu-getvalues,REQUIRED,$(1),$(2)) \
+ $$(filter-out $$(call lu-getvalues,DEPENDS_EXCLUDE,$(1),$(2)), \
+ $$(call lu-getvalues,DEPENDS,$(1),$(2)) \
+ $$(call lu-getvalues,REQUIRED,$(1),$(2))) \
$$(if $$(wildcard $(1)$(3)_FAILED),LU_FORCE,) \
$$(if $$(wildcard $(1)$(3)_NEED_REBUILD),LU_FORCE,) \
$$(if $$(wildcard $(1)$(3)_NEED_REBUILD_IN_PROGRESS),LU_FORCE,)
@@ -934,40 +952,35 @@ endif
%.bbl: %.aux
$(COMMON_PREFIX)$(call lu-call-prog,BIBTEX) $*
-_LaTeX_Make_GROUPS=BIN TEX
-_LaTeX_Make_BIN = figdepth.py gensubfig.py svg2dev.py svgdepth.py latexfilter.py
-_LaTeX_Make_BINDIR=bin
-_LaTeX_Make_BINORIGDIR= /FIXME_TDS_ROOT/scripts/latex-make
-_LaTeX_Make_TEX = figlatex.sty pdfswitch.sty texdepends.sty texgraphicx.sty
-_LaTeX_Make_TEXDIR=.
-_LaTeX_Make_TEXORIGDIR= /FIXME_TDS_ROOT/tex/latex/latex-make
+_LaTeX_Make_GROUPS=texmfscripts tex
+_LaTeX_Make_texmfscripts = LaTeX.mk figdepth.py gensubfig.py svg2dev.py svgdepth.py latexfilter.py
+_LaTeX_Make_texmfscripts_DIR = scripts/latex-make
+_LaTeX_Make_tex = figlatex.sty pdfswitch.sty texdepends.sty texgraphicx.sty
+_LaTeX_Make_tex_DIR = tex/latex/latex-make
.PHONY: LaTeX-Make-local-install LaTeX-Make-local-uninstall
-.PHONY: _LaTeX-Make-local-install-done
-_LaTeX-Make-local-install-done:
LaTeX-Make-local-uninstall::
+ $(if $(TEXMF_INSTALL_ROOT_DIR),,\
+ $(error TEXMF_INSTALL_ROOT_DIR must be set when calling LaTeX-Make-local-uninstall))
$(foreach g,$(_LaTeX_Make_GROUPS),\
$(foreach f,$(_LaTeX_Make_$(g)), \
- $(LU_RM) $(_LaTeX_Make_$(g)DIR)/$f && \
- ) (rmdir $(_LaTeX_Make_$(g)DIR) || true) && \
+ $(LU_RM) $(TEXMF_INSTALL_ROOT_DIR)/$(_LaTeX_Make_$(g)_DIR)/$f && \
+ ) (rmdir $(TEXMF_INSTALL_ROOT_DIR)/$(_LaTeX_Make_$(g)_DIR) || true) && \
) $(LU_RM) LaTeX.mk
-LaTeX-Make-local-install:: _LaTeX-Make-local-install-done
+LU_INSTALL_PKSEWHICH?=env -u TEXMFHOME kpsewhich
+LaTeX-Make-local-install::
+ $(if $(TEXMF_INSTALL_ROOT_DIR),,\
+ $(error TEXMF_INSTALL_ROOT_DIR must be set when calling LaTeX-Make-local-install))
+ $(if $(filter texmf,$(notdir $(TEXMF_INSTALL_ROOT_DIR))),,\
+ $(if $(FORCE),,\
+ $(warning TEXMF_INSTALL_ROOT_DIR does not end with 'texmf')\
+ $(error Use FORCE=1 if you really want to use this value of TEXMF_INSTALL_ROOT_DIR)))
$(foreach g,$(_LaTeX_Make_GROUPS),\
- mkdir -p $(_LaTeX_Make_$(g)DIR) && \
+ mkdir -p $(TEXMF_INSTALL_ROOT_DIR)/$(_LaTeX_Make_$(g)_DIR) && \
$(foreach f,$(_LaTeX_Make_$(g)), \
- $(LU_CP) $(_LaTeX_Make_$(g)ORIGDIR)/$f $(_LaTeX_Make_$(g)DIR) && \
- )) $(LU_CP) $(_LaTeX_Make_BINORIGDIR)/LaTeX.mk .
- @echo >> LaTeX.mk
- @echo "_LaTeX-Make-local-install-done:" >> LaTeX.mk
- @echo " @echo " >> LaTeX.mk
- @echo " @echo 'You must remove (at least) the locally installed LaTeX.mk file if you wish to'" >> LaTeX.mk
- @echo " @echo 'restart the installation.'" >> LaTeX.mk
- @echo " @echo 'You can try \"make LaTeX-Make-local-uninstall\"'" >> LaTeX.mk
- @echo " @echo " >> LaTeX.mk
- @echo " @exit 1" >> LaTeX.mk
- @echo
- @echo "=> All LaTeX-Make files are locally copied"
- @echo
+ $(LU_CP) -v $$($(LU_INSTALL_PKSEWHICH) -format $g $f) $(TEXMF_INSTALL_ROOT_DIR)/$(_LaTeX_Make_$(g)_DIR) && \
+ )) echo "Installation into $(TEXMF_INSTALL_ROOT_DIR) done."
+ @echo "==> You must ensure your TEXMFHOME contains this path <=="
diff --git a/Master/texmf-dist/doc/support/latex-make/README b/Master/texmf-dist/doc/support/latex-make/README
index 3cdb727843d..15da8027c3d 100644
--- a/Master/texmf-dist/doc/support/latex-make/README
+++ b/Master/texmf-dist/doc/support/latex-make/README
@@ -2,7 +2,7 @@
| The LaTeX-Make system |
+------------------------------+
-VERSION: 2.2.5
+VERSION: 2.3.0
DESCRIPTION
===========
diff --git a/Master/texmf-dist/doc/support/latex-make/figlatex.pdf b/Master/texmf-dist/doc/support/latex-make/figlatex.pdf
index dee4625b9f0..53e43f24542 100644
--- a/Master/texmf-dist/doc/support/latex-make/figlatex.pdf
+++ b/Master/texmf-dist/doc/support/latex-make/figlatex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/latex-make/latex-make.pdf b/Master/texmf-dist/doc/support/latex-make/latex-make.pdf
index 6410ca24954..d292cf6a77d 100644
--- a/Master/texmf-dist/doc/support/latex-make/latex-make.pdf
+++ b/Master/texmf-dist/doc/support/latex-make/latex-make.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/latex-make/texdepends.pdf b/Master/texmf-dist/doc/support/latex-make/texdepends.pdf
index a97c9888537..9ea4996ead5 100644
--- a/Master/texmf-dist/doc/support/latex-make/texdepends.pdf
+++ b/Master/texmf-dist/doc/support/latex-make/texdepends.pdf
Binary files differ