summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-08-04 13:20:59 +0000
committerKarl Berry <karl@freefriends.org>2012-08-04 13:20:59 +0000
commit9e23f2efd8ea456d1f3090df40c2f5a04578919e (patch)
treedb6c86a5724d9ab38af0c0061942a8e019b52c63
parent27b522d95b4dc039de771cc95471f84de5200e6e (diff)
tl-sys-wrapper.pl not needed
git-svn-id: svn://tug.org/texlive/trunk@27307 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/tetex/ChangeLog6
-rw-r--r--Build/source/texk/tetex/Makefile.am2
-rw-r--r--Build/source/texk/tetex/Makefile.in5
-rwxr-xr-xBuild/source/texk/tetex/tl-sys-wrapper.pl34
4 files changed, 8 insertions, 39 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index b09c6d2cf5d..abdc49b7cb4 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-04 Karl Berry <karl@tug.org>
+
+ * tl-sys-wrapper: not needed. The Windows wrapper, runscript.tlu,
+ already handles -sys, as does the Windows fmtutil.c.
+ * Makefile.am (EXTRA_DIST): remove it again.
+
2012-08-03 Karl Berry <karl@tug.org>
* tl-sys-wrapper.pl: initial attempt.
diff --git a/Build/source/texk/tetex/Makefile.am b/Build/source/texk/tetex/Makefile.am
index f6f07b6c115..2f82752bf0a 100644
--- a/Build/source/texk/tetex/Makefile.am
+++ b/Build/source/texk/tetex/Makefile.am
@@ -7,8 +7,6 @@ ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST =
-EXTRA_DIST += tl-sys-wrapper.pl
-
perl_scripts = \
updmap
diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in
index 6a808bc51e6..1ac3a78edeb 100644
--- a/Build/source/texk/tetex/Makefile.in
+++ b/Build/source/texk/tetex/Makefile.in
@@ -230,9 +230,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-EXTRA_DIST = tl-sys-wrapper.pl ../../build-aux/relpath README.texdoctk \
- old-fontinst.bat old-updmap updmap-single.pl updmap.help2man \
- $(TESTS)
+EXTRA_DIST = ../../build-aux/relpath README.texdoctk old-fontinst.bat \
+ old-updmap updmap-single.pl updmap.help2man $(TESTS)
perl_scripts = \
updmap
diff --git a/Build/source/texk/tetex/tl-sys-wrapper.pl b/Build/source/texk/tetex/tl-sys-wrapper.pl
deleted file mode 100755
index fead6394d3a..00000000000
--- a/Build/source/texk/tetex/tl-sys-wrapper.pl
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env perl
-# $Id$
-# Public domain. Perl version originally written by Karl Berry, 2012.
-# Earlier shell version by Thomas Esser.
-#
-# Generic -sys wrapper. Symlink to this script as updmap-sys,
-# fmtutil-sys, etc.
-
-&main (); # never returns.
-
-sub main {
- chomp (my $v = `kpsewhich -var-value TEXMFSYSVAR`);
- die "$0: could not retrieve TEXMFSYSVAR value with kpsewhich: $!"
- if ! $v;
- $ENV{"TEXMFVAR"} = $v;
-
- chomp (my $c = `kpsewhich -var-value TEXMFSYSCONFIG`);
- die "$0: could not retrieve TEXMFSYSCONFIG value with kpsewhich: $!"
- if ! $c;
- $ENV{"TEXMFCONFIG"} = $c;
-
- # updmap-sys -> updmap, etc. Case insensitive needed for Windows,
- # but doesn't seem bad on Unix either.
- (my $progname = $0) =~ s/-sys$//i;
- die "$0: program name does not end in -sys" if $progname eq $0;
-
- #warn "doing exec $0, $progname, @ARGV";
-
- # execute the program name we computed, with whatever arguments we have.
- exec ($progname, @ARGV);
-
- # should never get here.
- die "$0: exec($progname, @ARGV) failed: $!";
-}