summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-04-27 17:22:19 +0000
committerKarl Berry <karl@freefriends.org>2014-04-27 17:22:19 +0000
commit3591a4b4a9486d9e9c80ceb93faa25ab7047fb4b (patch)
treeb25016acc3d7244ff6d3fe8c6d698fdf1dae9c23 /Master
parent3cd0821d721678ec36d4f9374be5bee694850488 (diff)
(xz.i386-cygwin.exe): do not list, we only needs
xzdec in the "live" installer, and cygwin is already included anyway. git-svn-id: svn://tug.org/texlive/trunk@33697 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc9
1 files changed, 4 insertions, 5 deletions
diff --git a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
index b720474d449..0b7e5de4268 100644
--- a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
@@ -3,7 +3,7 @@ shortdesc TeX Live standalone installer package
longdesc This package defines the files to go into the installer
longdesc archives (install-tl-unx.tar.gz, install-tl.zip) built
longdesc by the tl-make-installer script. Most of what's here is also
-longdesc included in the texlive.infra package -- ordinarily duplicates
+longdesc included in the texlive.infra package -- ordinarily, duplicates
longdesc are not allowed, but in this case, 00texlive.installer is never
longdesc used *except* to build the installer archives, so it's ok.
longdesc
@@ -17,7 +17,7 @@ runpattern d tlpkg/installer
# but no xz binaries:
runpattern !d tlpkg/installer/xz
runpattern !d tlpkg/installer/wget
-# tar.exe is included in the win32 files below
+# tar.exe is included in the win32 binpattern below, so exclude from runpattern
runpattern !f tlpkg/installer/tar.exe
#
# Windows only:
@@ -37,8 +37,7 @@ sparc-solaris,\
universal-darwin,win32,x86_64-darwin,x86_64-solaris \
tlpkg/installer/wget/wget.${ARCH}
#
-# Our ${ARCH} (probably) only works as a directory component, not
-# extensions, so annoyingly list explicit exe's:
+# 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
-binpattern f/i386-cygwin tlpkg/installer/xz/xz.i386-cygwin.exe