texlive[54133] Build/source/texk/web2c: keep texlua[jit][c] as links

[commits+karl at tug.org]

Revision: 54133
          http://tug.org/svn/texlive?view=revision&revision=54133
Author:   karl
Date:     2020-03-06 22:48:55 +0100 (Fri, 06 Mar 2020)
Log Message:
-----------
keep texlua[jit][c] as links to base lua[jit]tex

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/Makefile.in
    trunk/Build/source/texk/web2c/luatexdir/ChangeLog
    trunk/Build/source/texk/web2c/luatexdir/am/luatex.am

Modified: trunk/Build/source/texk/web2c/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.in	2020-03-06 21:37:59 UTC (rev 54132)
+++ trunk/Build/source/texk/web2c/Makefile.in	2020-03-06 21:48:55 UTC (rev 54133)
@@ -229,7 +229,8 @@
 @LUAHBTEX_TRUE@@WIN32_TRUE at am__append_90 = call_luahbtex
 @LUAHBTEX_TRUE@@WIN32_TRUE at am__append_91 = install-luahbtex-links
 @LUAHBTEX_TRUE@@WIN32_TRUE at am__append_92 = uninstall-luahbtex-links
- at LUAHBTEX_TRUE@@WIN32_FALSE at am__append_93 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
+# keep texlua[c] as links to luatex unless luatex is not installed.
+ at LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE at am__append_93 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
 @LUAJITTEX_TRUE at am__append_94 = luajittex
 @LUAJITTEX_TRUE@@WIN32_TRUE at am__append_95 = call_luajittex
 @LUAJITTEX_TRUE@@WIN32_TRUE at am__append_96 = install-luajittex-links
@@ -239,7 +240,8 @@
 @LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_100 = call_luajithbtex
 @LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_101 = install-luajithbtex-links
 @LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_102 = uninstall-luajithbtex-links
- at LUAJITHBTEX_TRUE@@WIN32_FALSE at am__append_103 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
+# keep texluajit[c] as links to luajittex unless luajittex is not installed.
+ at LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE at am__append_103 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
 @LUATEX_TRUE at am__append_104 = $(luatex_tests)
 @LUAHBTEX_TRUE at am__append_105 = $(luahbtex_tests)
 @LUAJITTEX_TRUE at am__append_106 = $(luajittex_tests)

Modified: trunk/Build/source/texk/web2c/luatexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/ChangeLog	2020-03-06 21:37:59 UTC (rev 54132)
+++ trunk/Build/source/texk/web2c/luatexdir/ChangeLog	2020-03-06 21:48:55 UTC (rev 54133)
@@ -1,3 +1,11 @@
+2020-03-06  Karl Berry  <karl at 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 at gmail.com>
     * restore state for \input delimited with {}
 

Modified: trunk/Build/source/texk/web2c/luatexdir/am/luatex.am
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/am/luatex.am	2020-03-06 21:37:59 UTC (rev 54132)
+++ trunk/Build/source/texk/web2c/luatexdir/am/luatex.am	2020-03-06 21:48:55 UTC (rev 54133)
@@ -24,7 +24,10 @@
 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 @@
 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