keep texlua[jit][c] as links to base lua[jit]tex

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

3 files changed, 18 insertions, 2 deletions

diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 3e4e534c7ba..adbd36a8963 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -229,7 +229,8 @@ TESTS = tangle.test $(am__EXEEXT_45) ctiedir/ctie.test \
 @LUAHBTEX_TRUE@@WIN32_TRUE@am__append_90 = call_luahbtex
 @LUAHBTEX_TRUE@@WIN32_TRUE@am__append_91 = install-luahbtex-links
 @LUAHBTEX_TRUE@@WIN32_TRUE@am__append_92 = uninstall-luahbtex-links
-@LUAHBTEX_TRUE@@WIN32_FALSE@am__append_93 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
+# keep texlua[c] as links to luatex unless luatex is not installed.
+@LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE@am__append_93 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
 @LUAJITTEX_TRUE@am__append_94 = luajittex
 @LUAJITTEX_TRUE@@WIN32_TRUE@am__append_95 = call_luajittex
 @LUAJITTEX_TRUE@@WIN32_TRUE@am__append_96 = install-luajittex-links
@@ -239,7 +240,8 @@ TESTS = tangle.test $(am__EXEEXT_45) ctiedir/ctie.test \
 @LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_100 = call_luajithbtex
 @LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_101 = install-luajithbtex-links
 @LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_102 = uninstall-luajithbtex-links
-@LUAJITHBTEX_TRUE@@WIN32_FALSE@am__append_103 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
+# keep texluajit[c] as links to luajittex unless luajittex is not installed.
+@LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE@am__append_103 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
 @LUATEX_TRUE@am__append_104 = $(luatex_tests)
 @LUAHBTEX_TRUE@am__append_105 = $(luahbtex_tests)
 @LUAJITTEX_TRUE@am__append_106 = $(luajittex_tests)
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 33b871083ab..7b19467c3a5 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,11 @@
+2020-03-06  Karl Berry  <karl@tug.org>
+
+	* am/luatex.am (texlua[jit][c]) [LUA[JIT]HBTEX && !LUA[JIT]TEX]:
+	keep these as links to base lua[jit]tex, not overwriting
+	with links to luahb[jit]tex, unless the base luatex is not installed.
+	https://tug.org/pipermail/tex-live/2020-March/044948.html
+	(and preceding)
+
 2020-02-12  Luigi Scarso <luigi.scarso@gmail.com>
     * restore state for \input delimited with {}
 
diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am
index ab48c047c06..31210a4ed74 100644
--- a/Build/source/texk/web2c/luatexdir/am/luatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/luatex.am
@@ -24,7 +24,10 @@ noinst_PROGRAMS += call_luahbtex
 install_exe_links += install-luahbtex-links
 uninstall_exe_links += uninstall-luahbtex-links
 else !WIN32
+if !LUATEX
+# keep texlua[c] as links to luatex unless luatex is not installed.
 bin_links += luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
+endif !LUATEX
 endif !WIN32
 endif LUAHBTEX
 
@@ -46,7 +49,10 @@ noinst_PROGRAMS += call_luajithbtex
 install_exe_links += install-luajithbtex-links
 uninstall_exe_links += uninstall-luajithbtex-links
 else !WIN32
+if !LUAJITTEX
+# keep texluajit[c] as links to luajittex unless luajittex is not installed.
 bin_links += luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
+endif !LUAJITTEX
 endif !WIN32
 endif LUAJITHBTEX