keep runscript.{dll,exe} copies here, and install them on Windows

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

7 files changed, 18 insertions, 10 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog
index 83630c9d49e..124e00e0e53 100644
--- a/Build/source/texk/texlive/linked_scripts/ChangeLog
+++ b/Build/source/texk/texlive/linked_scripts/ChangeLog
@@ -1,3 +1,8 @@
+2023-02-28  Karl Berry  <karl@freefriends.org>
+
+	* Makefile.am (install-data-hook) [WIN32]: don't install
+	mtxrun.dll, since ConTeXt isn't handled here any more.
+
 2022-09-11  Reinhard Kotucha  <reinhard.kotucha@web.de>
 
 	* Makefile.am : rename rungs.tlu to rungs.lua
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index a431f1d70e0..32ea8d403d1 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -302,7 +302,6 @@ if WIN32
 	$(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.dll $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.exe $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.tlu $(DESTDIR)$(bindir)
-	$(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/context/mtxrun.dll $(DESTDIR)$(bindir)
 else !WIN32
 ## Name the link as the basename, removing any extension,
 ## except for listings-ext.sh, which is documented as that name.
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index eb1a95e1d57..9bcdbc030da 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -751,7 +751,6 @@ install-data-hook: installdirs-local
 @WIN32_TRUE@	$(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.dll $(DESTDIR)$(bindir)
 @WIN32_TRUE@	$(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.exe $(DESTDIR)$(bindir)
 @WIN32_TRUE@	$(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.tlu $(DESTDIR)$(bindir)
-@WIN32_TRUE@	$(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/context/mtxrun.dll $(DESTDIR)$(bindir)
 @WIN32_FALSE@	@REL=`$(relpath) '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \
 @WIN32_FALSE@	if test -z "$$REL"; then \
 @WIN32_FALSE@	  echo 'unable to compute relative path for linked scripts' >&2; \
diff --git a/Build/source/texk/texlive/windows_wrapper/README b/Build/source/texk/texlive/windows_wrapper/README
index 5377c7ac07b..0a43aed34f2 100644
--- a/Build/source/texk/texlive/windows_wrapper/README
+++ b/Build/source/texk/texlive/windows_wrapper/README
@@ -1,8 +1,11 @@
-This file and the graphics are public domain.

-

-This directory is for the generic TeX Live wrapper on Windows that is

-used for most scripts. The main file is runscript.tlu.

-

-*.svg are the sources for *.ico,

-and the *.ico are used in wrappers.

-Hence their locaton here.

+$Id$	
+This README file and the graphics are public domain.
+
+This directory is for the generic TeX Live wrapper on Windows that is
+used for most scripts. The main file is runscript.tlu.
+
+runscript.exe/dll are copied here from the runtime (bin/windows) because
+../linked_scripts/Makefile[.am] installs them on Windows.
+
+*.svg are the sources for *.ico,
+and the *.ico are used in wrappers. Hence their locaton here.
diff --git a/Build/source/texk/texlive/windows_wrapper/runscript.dll b/Build/source/texk/texlive/windows_wrapper/runscript.dll
new file mode 100755
index 00000000000..14313ecc506
--- /dev/null
+++ b/Build/source/texk/texlive/windows_wrapper/runscript.dll
diff --git a/Build/source/texk/texlive/windows_wrapper/runscript.exe b/Build/source/texk/texlive/windows_wrapper/runscript.exe
new file mode 100755
index 00000000000..3332231b08c
--- /dev/null
+++ b/Build/source/texk/texlive/windows_wrapper/runscript.exe
diff --git a/Master/tlpkg/dev/srclist.txt b/Master/tlpkg/dev/srclist.txt
index b31d77789ea..a4e2e6178f0 100644
--- a/Master/tlpkg/dev/srclist.txt
+++ b/Master/tlpkg/dev/srclist.txt
@@ -24,6 +24,8 @@ Master/tlpkg/TeXLive/TLConfig.pm Build/source/texk/tests/TeXLive/
 
 # Maintained in Master (with Id expansion there).
 Master/bin/windows/runscript.tlu Build/source/texk/texlive/windows_wrapper/runscript.tlu
+Master/bin/windows/runscript.exe Build/source/texk/texlive/windows_wrapper/runscript.exe
+Master/bin/windows/runscript.dll Build/source/texk/texlive/windows_wrapper/runscript.dll
 
 # Glyph lists used by pdftex, now maintained in lcdf-typetools:
 Build/source/texk/lcdf-typetools/lcdf-typetools-*/glyphtounicode.tex Master/texmf-dist/tex/generic/pdftex/glyphtounicode.tex