summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-31 23:27:37 +0000
committerKarl Berry <karl@freefriends.org>2018-01-31 23:27:37 +0000
commit6a9d43678da057656daa2730dfe0d416beabcfa3 (patch)
tree9b601c65102c2c5618832ff2ca2e005910044b52 /Master
parent36524de8c69192388c01a7252c8e609ee0558635 (diff)
consistently list non-wget-provided (gnu/linux) platforms
git-svn-id: svn://tug.org/texlive/trunk@46507 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc27
-rw-r--r--Master/tlpkg/tlpsrc/texlive.infra.tlpsrc3
2 files changed, 17 insertions, 13 deletions
diff --git a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
index b830cf94c91..2a4394502f0 100644
--- a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
@@ -24,22 +24,25 @@ runpattern !f tlpkg/installer/tar.exe
# Windows only:
binpattern d/win32 tlpkg/tlperl
binpattern f/win32 tlpkg/installer/tar.exe
+binpattern f/win32 tlpkg/installer/wget/wget.exe
+binpattern f/win32 tlpkg/installer/xz/xzdec.exe
binpattern f/win32 install-tl-windows.bat
binpattern f/win32 install-tl-advanced.bat
#
# xzdec binaries for all (but no need for xz):
binpattern f tlpkg/installer/xz/xzdec.${ARCH}
#
-# the platforms for which we provide wget:
-binpattern f/\
-amd64-freebsd,amd64-netbsd,\
-i386-darwin,i386-freebsd,i386-netbsd,i386-solaris,\
-powerpc-darwin,\
-sparc-solaris,\
-win32,x86_64-darwin,x86_64-darwinlegacy,x86_64-solaris \
+# platforms for which we do not provide wget, because it is part of the
+# normal system install (this list is duplicated in texlive.infra):
+binpattern f/!\
+aarch64-linux,\
+armel-linux,\
+armhf-linux,\
+i386-cygwin,\
+i386-linux,\
+i386-solaris,\
+powerpc-linux,\
+x86_64-cygwin,\
+x86_64-linux,\
+x86_64-solaris \
tlpkg/installer/wget/wget.${ARCH}
-#
-# Must annoyingly list explicit Windows (but not Cygwin) exe's, since
-# ${ARCH} can't reasonably deal with this.
-binpattern f/win32 tlpkg/installer/wget/wget.exe
-binpattern f/win32 tlpkg/installer/xz/xzdec.exe
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index 42ddd64172e..2441744deb4 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -49,7 +49,8 @@ binpattern f/x86_64-cygwin tlpkg/installer/xz/xz.x86_64-cygwin.exe
binpattern f/!x86_64-cygwin tlpkg/installer/xz/xzdec.${ARCH}
binpattern f/!x86_64-cygwin tlpkg/installer/xz/xz.${ARCH}
#
-# Platforms which provide wget as part of the normal system install:
+# platforms for which we do not provide wget, because it is part of the
+# normal system install (this list is duplicated in 00texlive.installer):
binpattern f/!\
aarch64-linux,\
armel-linux,\