latex-make (11feb16)

git-svn-id: svn://tug.org/texlive/trunk@39678 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 54 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/support/latex-make/LaTeX.mk b/Master/texmf-dist/doc/support/latex-make/LaTeX.mk
index eb11e60e83d..243c06ad6db 100644
--- a/Master/texmf-dist/doc/support/latex-make/LaTeX.mk
+++ b/Master/texmf-dist/doc/support/latex-make/LaTeX.mk
@@ -37,14 +37,12 @@ endif
 
 ####[ Configuration ]################################################
 
-# For global site options
--include LaTeX.mk.conf
-
 # list of messages categories to display
 LU_SHOW ?= warning #info debug debug-vars
 
 # Select GNU/BSD/MACOSX utils (cp, rm, mv, ...)
-LU_UTILS ?= GNU
+LU_UTILS ?= $(shell ( /bin/cp --heelp > /dev/null 2>&1 && echo GNU ) || echo BSD )
+export LU_UTILS
 
 ####[ End of configuration ]################################################
 # Modifying the remaining of this document may endanger you life!!! ;)
@@ -522,9 +520,9 @@ $(eval $(call lu-addtovar-global,FLAVORS,PDF PS))
 define _lu-do-latex # 1:master 2:flavor 3:source.tex 4:ext(.dvi/.pdf)
   exec 3>&1; \
   run() { \
-	echo -n "Running:" 1>&3 ; \
+	printf "Running:" 1>&3 ; \
 	for arg; do \
-		echo -n " '$$arg'" 1>&3 ; \
+		printf "%s" " '$$arg'" 1>&3 ; \
 	done ; echo 1>&3 ; \
 	"$$@" ; \
   }; \
@@ -919,3 +917,41 @@ 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
+
+.PHONY: LaTeX-Make-local-install LaTeX-Make-local-uninstall
+.PHONY: _LaTeX-Make-local-install-done
+_LaTeX-Make-local-install-done:
+
+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) LaTeX.mk
+
+LaTeX-Make-local-install:: _LaTeX-Make-local-install-done
+	$(foreach g,$(_LaTeX_Make_GROUPS),\
+		mkdir -p $(_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
+
diff --git a/Master/texmf-dist/doc/support/latex-make/LaTeX.mk.conf b/Master/texmf-dist/doc/support/latex-make/LaTeX.mk.conf
index c6f3fa931d7..e69de29bb2d 100644
--- a/Master/texmf-dist/doc/support/latex-make/LaTeX.mk.conf
+++ b/Master/texmf-dist/doc/support/latex-make/LaTeX.mk.conf
@@ -1,3 +0,0 @@
-# Choose between GNU/BSD utilities (cp, rm, ...)
-# LU_UTILS = GNU
-# LU_UTILS = BSD
diff --git a/Master/texmf-dist/doc/support/latex-make/README b/Master/texmf-dist/doc/support/latex-make/README
index 57e43009a5e..a6be56377f6 100644
--- a/Master/texmf-dist/doc/support/latex-make/README
+++ b/Master/texmf-dist/doc/support/latex-make/README
@@ -1,8 +1,8 @@
               +------------------------------+
-	      |    The LaTeX-Make system     |
+              |    The LaTeX-Make system     |
               +------------------------------+
 
-VERSION: 2.1.19.1
+VERSION: 2.2.2
 
 DESCRIPTION
 ===========
@@ -28,12 +28,6 @@ INSTALLATION:
 =============
 
 Once generated, the following files need to be installed:
-* LaTeX.mk:
-  This is the Makefile snipset to include into your main Makefile.
-  To avoid the need to hardcode the path of LaTeX.mk in the 'include' directive
-  of the Makefile, LaTeX.mk must be installed in a default search directory of
-  GNUMake such as PREFIX/include, /usr/local/include, /usr/include/, etc.
-  See your GNUMake documentation for the list of such search directories;
 * *.sty, *.cfg
   Main LaTeX package files. Should be installed into
   TEXMF/tex/latex/latex-make/ where TEXMF is a base of a TeX Directory
@@ -41,6 +35,16 @@ Once generated, the following files need to be installed:
 * *.py
   Helper scripts used by LaTeX.mk. They should be installed into
   TEXMF/scripts/latex-make/
+* LaTeX.mk:
+  This is the Makefile snipset to include into your main Makefile.
+  To avoid the need to hardcode the path of LaTeX.mk in the 'include' directive
+  of the Makefile, LaTeX.mk must be installed in a default search directory of
+  GNUMake such as PREFIX/include, /usr/local/include, /usr/include/, etc.
+  See your GNUMake documentation for the list of such search directories;
+    In order to be able to also use the 'LaTeX-Make-local-install' target,
+  LaTeX.mk must also be installed into TEXMF/scripts/latex-make/
+  *and* the two lines with "FIXME" at the end of this file must be updated
+  with the TEXMF installation path.
 * *.pdf
   Documentation that can be installed into
   TEXMF/doc/latex/latex-make/
diff --git a/Master/texmf-dist/doc/support/latex-make/figlatex.pdf b/Master/texmf-dist/doc/support/latex-make/figlatex.pdf
index dadd499d909..06338a4b750 100644
--- a/Master/texmf-dist/doc/support/latex-make/figlatex.pdf
+++ b/Master/texmf-dist/doc/support/latex-make/figlatex.pdf
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 9d9c2ca5035..a09cb6806e2 100644
--- a/Master/texmf-dist/doc/support/latex-make/latex-make.pdf
+++ b/Master/texmf-dist/doc/support/latex-make/latex-make.pdf
diff --git a/Master/texmf-dist/doc/support/latex-make/texdepends.pdf b/Master/texmf-dist/doc/support/latex-make/texdepends.pdf
index 400393dcad7..03e34655009 100644
--- a/Master/texmf-dist/doc/support/latex-make/texdepends.pdf
+++ b/Master/texmf-dist/doc/support/latex-make/texdepends.pdf