summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-02-20 16:50:51 +0000
committerKarl Berry <karl@freefriends.org>2023-02-20 16:50:51 +0000
commit238234c54e8256ccc008bd372196c0d7c71ab7d9 (patch)
tree80267e944718641b6e76b684bcfe19ebe5a80ae5 /Master/tlpkg
parent7aeec2ae41c94b9f67088954568ed9625c459b97 (diff)
win32->windows continues
git-svn-id: svn://tug.org/texlive/trunk@65958 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm10
-rw-r--r--Master/tlpkg/tlpsrc/bibtexu.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/context.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/xindy.tlpsrc4
4 files changed, 10 insertions, 10 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 2dc83012380..151bb1a153f 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -297,14 +297,13 @@ understands the C<$(...)> construct. This means that on old-enough
systems, such as Solaris, we have to look for a shell. We use the value
of the C<CONFIG_SHELL> environment variable if it is set, else
C</bin/ksh> if it exists, else C</bin/bash> if it exists, else give up.
+Happily, C<config.guess> later reverted this change, but we keep our
+shell-finding code anyway to defend against future mistakes of the same ilk.
=cut
sub platform {
- if (defined $::_platform_) {
- print STDERR "_platform_: already defined as $::_platform_\n";
- }
- unless (defined $::_platform_) {
+ if (! defined $::_platform_) {
if ($^O =~ /^MSWin/i) {
print STDERR "\$^O is $^O\n";
$::_platform_ = "windows";
@@ -532,7 +531,8 @@ sub platform_desc {
'sparc-linux' => 'GNU/Linux on Sparc',
'sparc-solaris' => 'Solaris on Sparc',
'universal-darwin' => 'MacOSX current (10.14-) on ARM/x86_64',
- 'windows' => 'Windows',
+ 'win32' => 'Windows (32-bit)',
+ 'windows' => 'Windows (64-bit)',
'x86_64-cygwin' => 'Cygwin on x86_64',
'x86_64-darwinlegacy' => 'MacOSX legacy (10.6-) on x86_64',
'x86_64-dragonfly' => 'DragonFlyBSD on x86_64',
diff --git a/Master/tlpkg/tlpsrc/bibtexu.tlpsrc b/Master/tlpkg/tlpsrc/bibtexu.tlpsrc
index 7550aa06f7b..bddab721020 100644
--- a/Master/tlpkg/tlpsrc/bibtexu.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bibtexu.tlpsrc
@@ -1,3 +1,3 @@
category TLCore
shortdesc BibTeX variant supporting Unicode (UTF-8), via ICU
-binpattern f/!win32 bin/${ARCH}/bibtexu
+binpattern f bin/${ARCH}/bibtexu
diff --git a/Master/tlpkg/tlpsrc/context.tlpsrc b/Master/tlpkg/tlpsrc/context.tlpsrc
index 01cad6910e3..1e0c8f0049e 100644
--- a/Master/tlpkg/tlpsrc/context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context.tlpsrc
@@ -70,5 +70,5 @@ binpattern f bin/${ARCH}/mtxrun
binpattern f bin/${ARCH}/mtxrunjit
binpattern f bin/${ARCH}/texexec
binpattern f bin/${ARCH}/texmfstart
-binpattern f/win32 bin/win32/mtxrun.lua
-binpattern f/win32 bin/win32/contextjit.exe
+binpattern f/windows bin/windows/mtxrun.lua
+binpattern f/windows bin/windows/contextjit.exe
diff --git a/Master/tlpkg/tlpsrc/xindy.tlpsrc b/Master/tlpkg/tlpsrc/xindy.tlpsrc
index b993930199c..72713175e4b 100644
--- a/Master/tlpkg/tlpsrc/xindy.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xindy.tlpsrc
@@ -16,9 +16,9 @@ binpattern f/universal-darwin bin/universal-darwin/xindy-arm64.mem
binpattern f/universal-darwin bin/universal-darwin/xindy-x86_64.mem
#
# cygwin and windows must use a different name for the clisp executable.
-binpattern f/!x86_64-cygwin,win32,${no_xindy_platforms} \
+binpattern f/!x86_64-cygwin,windows,${no_xindy_platforms} \
bin/${ARCH}/xindy.run
-binpattern f/x86_64-cygwin,win32 bin/${ARCH}/xindy-lisp.exe
+binpattern f/x86_64-cygwin,windows bin/${ARCH}/xindy-lisp.exe
#
docpattern f texmf-dist/doc/man/man1/*xindy.*
docpattern d texmf-dist/doc/xindy