texlive[55329] Build/source: do not run texlinks if it is not
commits+karl at tug.org
commits+karl at tug.org
Fri May 29 00:03:59 CEST 2020
Revision: 55329
http://tug.org/svn/texlive?view=revision&revision=55329
Author: karl
Date: 2020-05-29 00:03:59 +0200 (Fri, 29 May 2020)
Log Message:
-----------
do not run texlinks if it is not installed
Modified Paths:
--------------
trunk/Build/source/ChangeLog
trunk/Build/source/Makefile.am
trunk/Build/source/Makefile.in
trunk/Build/source/texk/texlive/tl_support/ChangeLog
trunk/Build/source/texk/texlive/tl_support/Makefile.am
trunk/Build/source/texk/texlive/tl_support/Makefile.in
Modified: trunk/Build/source/ChangeLog
===================================================================
--- trunk/Build/source/ChangeLog 2020-05-28 22:03:10 UTC (rev 55328)
+++ trunk/Build/source/ChangeLog 2020-05-28 22:03:59 UTC (rev 55329)
@@ -1,3 +1,9 @@
+2020-05-28 Karl Berry <karl at freefriends.org>
+
+ * Makefile.am (world): do not descend into $(texlinks_dir) if it
+ doesn't exist. Report from Andreas Scherer,
+ https://tug.org/pipermail/tlbuild/2020q1/004614.html.
+
2020-05-14 Karl Berry <karl at freefriends.org>
* reautoconf for removal of poppler support.
Modified: trunk/Build/source/Makefile.am
===================================================================
--- trunk/Build/source/Makefile.am 2020-05-28 22:03:10 UTC (rev 55328)
+++ trunk/Build/source/Makefile.am 2020-05-28 22:03:59 UTC (rev 55329)
@@ -53,8 +53,11 @@
@echo "top-level make $@: running install-strip..."
$(MAKE) $(AM_MAKEFLAGS) install-strip
#
- @echo "top-level make $@: making run-texlinks in $(texlinks_dir) ..."
- cd $(texlinks_dir) && $(MAKE) $(AM_MAKEFLAGS) run-texlinks
+# Just in case it's not a full checkout.
+ if test -d "$(texlinks_dir)"; then \
+ echo "top-level make $@: making run-texlinks in $(texlinks_dir) ..."; \
+ cd $(texlinks_dir) && $(MAKE) $(AM_MAKEFLAGS) run-texlinks; \
+ else :; fi
#
@echo "top-level make $@: running $(check_target)..."
$(MAKE) $(AM_MAKEFLAGS) $(check_target)
Modified: trunk/Build/source/Makefile.in
===================================================================
--- trunk/Build/source/Makefile.in 2020-05-28 22:03:10 UTC (rev 55328)
+++ trunk/Build/source/Makefile.in 2020-05-28 22:03:59 UTC (rev 55329)
@@ -1044,8 +1044,11 @@
@echo "top-level make $@: running install-strip..."
$(MAKE) $(AM_MAKEFLAGS) install-strip
#
- @echo "top-level make $@: making run-texlinks in $(texlinks_dir) ..."
- cd $(texlinks_dir) && $(MAKE) $(AM_MAKEFLAGS) run-texlinks
+# Just in case it's not a full checkout.
+ if test -d "$(texlinks_dir)"; then \
+ echo "top-level make $@: making run-texlinks in $(texlinks_dir) ..."; \
+ cd $(texlinks_dir) && $(MAKE) $(AM_MAKEFLAGS) run-texlinks; \
+ else :; fi
#
@echo "top-level make $@: running $(check_target)..."
$(MAKE) $(AM_MAKEFLAGS) $(check_target)
Modified: trunk/Build/source/texk/texlive/tl_support/ChangeLog
===================================================================
--- trunk/Build/source/texk/texlive/tl_support/ChangeLog 2020-05-28 22:03:10 UTC (rev 55328)
+++ trunk/Build/source/texk/texlive/tl_support/ChangeLog 2020-05-28 22:03:59 UTC (rev 55329)
@@ -1,3 +1,15 @@
+2020-05-28 Karl Berry <karl at freefriends.org>
+
+ * Makefile.am (run-texlinks): do nothing if the texlinks script
+ or the needed fmtutil.cnf do not exist or are empty files. This
+ can happen with, e.g., --disable-texlive.
+ (texlinks_fmtutil): new variable for fmtutil.cnf location.
+ ($(DESTDIR)$(bindir)/texlinks,
+ $(DESTDIR)$(web2cdir)/fmtutil.cnf): remove targets, since we check
+ explicitly for the files now. make install must be run first.
+ Report from Andreas Scherer,
+ https://tug.org/pipermail/tlbuild/2020q1/004614.html.
+
2020-01-31 Karl Berry <karl at freefriends.org>
* mktexlsr.1,
Modified: trunk/Build/source/texk/texlive/tl_support/Makefile.am
===================================================================
--- trunk/Build/source/texk/texlive/tl_support/Makefile.am 2020-05-28 22:03:10 UTC (rev 55328)
+++ trunk/Build/source/texk/texlive/tl_support/Makefile.am 2020-05-28 22:03:59 UTC (rev 55329)
@@ -79,18 +79,23 @@
## fmtutil.cnf file to use for the sake of distro builds.
## We pass along the executable extension for the sake of cygwin, so we
## don't create dangling symlinks there (even though they work).
-#
+##
+## The texlinks script is installed by ../linked_scripts/Makefile[.am].
+## If it doesn't exist, e.g., if --disable-texlive was given, do nothing here.
+## So we do not specify make-level dependencies, but instead check if
+## the texlinks file (normally a symlink) and fmtutil.cnf exist.
+##
texlinks_prog = $(DESTDIR)$(bindir)/texlinks
+texlinks_fmtutil = $(DESTDIR)$(web2cdir)/fmtutil.cnf
#
run_texlinks = $(texlinks_prog) -v \
- -f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
+ -f $(texlinks_fmtutil) \
-e "$(EXEEXT)" $(DESTDIR)$(bindir)
#
-run-texlinks: $(DESTDIR)$(bindir)/texlinks
+run-texlinks:
if !WIN32
- PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks)
+ if test -s $(texlinks_prog) && test -s $(texlinks_fmtutil); then \
+ echo "running texlinks in `pwd` via: $(run_texlinks)"; \
+ PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks); \
+ else :; fi
endif !WIN32
-#
-$(DESTDIR)$(bindir)/texlinks: $(DESTDIR)$(web2cdir)/fmtutil.cnf
-$(DESTDIR)$(web2cdir)/fmtutil.cnf:
- $(MAKE) $(AM_MAKEFLAGS) install
Modified: trunk/Build/source/texk/texlive/tl_support/Makefile.in
===================================================================
--- trunk/Build/source/texk/texlive/tl_support/Makefile.in 2020-05-28 22:03:10 UTC (rev 55328)
+++ trunk/Build/source/texk/texlive/tl_support/Makefile.in 2020-05-28 22:03:59 UTC (rev 55329)
@@ -287,11 +287,11 @@
EXTRA_DIST = updmap.help2man fmtutil.help2man
Master_dir = $(top_srcdir)/../../../../Master
tl_scripts_dir = $(Master_dir)/texmf-dist/scripts/texlive
-#
texlinks_prog = $(DESTDIR)$(bindir)/texlinks
+texlinks_fmtutil = $(DESTDIR)$(web2cdir)/fmtutil.cnf
#
run_texlinks = $(texlinks_prog) -v \
- -f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
+ -f $(texlinks_fmtutil) \
-e "$(EXEEXT)" $(DESTDIR)$(bindir)
all: all-am
@@ -696,12 +696,11 @@
.PHONY: run-texlinks
#
-run-texlinks: $(DESTDIR)$(bindir)/texlinks
- at WIN32_FALSE@ PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks)
-#
-$(DESTDIR)$(bindir)/texlinks: $(DESTDIR)$(web2cdir)/fmtutil.cnf
-$(DESTDIR)$(web2cdir)/fmtutil.cnf:
- $(MAKE) $(AM_MAKEFLAGS) install
+run-texlinks:
+ at WIN32_FALSE@ if test -s $(texlinks_prog) && test -s $(texlinks_fmtutil); then \
+ at WIN32_FALSE@ echo "running texlinks in `pwd` via: $(run_texlinks)"; \
+ at WIN32_FALSE@ PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks); \
+ at WIN32_FALSE@ else :; fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
More information about the tex-live-commits
mailing list.