summaryrefslogtreecommitdiff
path: root/Master/texmf/scripts
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2012-07-30 23:46:16 +0000
committerNorbert Preining <preining@logic.at>2012-07-30 23:46:16 +0000
commitc731e1ff52a6ef50b32db649aa4fca51b69d0c23 (patch)
treebbd229930c78effeb1e631dbeaf88703d9352614 /Master/texmf/scripts
parent79298528102c078a0c50e4dc38a923d014d3a714 (diff)
merge from source
git-svn-id: svn://tug.org/texlive/trunk@27260 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf/scripts')
-rwxr-xr-xMaster/texmf/scripts/tetex/updmap.pl12
1 files changed, 9 insertions, 3 deletions
diff --git a/Master/texmf/scripts/tetex/updmap.pl b/Master/texmf/scripts/tetex/updmap.pl
index 4cbbc34fa8d..e6540b3a664 100755
--- a/Master/texmf/scripts/tetex/updmap.pl
+++ b/Master/texmf/scripts/tetex/updmap.pl
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
# mupdmap: utility to maintain map files for outline fonts.
-# $Id: updmap.pl 27239 2012-07-30 00:35:24Z preining $
+# $Id: updmap.pl 27259 2012-07-30 23:45:27Z preining $
#
# Copyright 2011, 2012 Norbert Preining
# This file is licensed under the GNU General Public License version 2
@@ -33,7 +33,7 @@ BEGIN {
}
-my $version = '$Id: updmap.pl 27239 2012-07-30 00:35:24Z preining $';
+my $version = '$Id: updmap.pl 27259 2012-07-30 23:45:27Z preining $';
use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
use strict;
@@ -220,7 +220,13 @@ sub main {
push @used_files, (win32() ? lc($f) : $f);
}
#
- chomp(my $TEXMFLOCALVAR =`kpsewhich --expand-path='\$TEXMFLOCAL'`);
+ my $TEXMFLOCALVAR;
+ if (win32()) {
+ chomp($TEXMFLOCALVAR =`kpsewhich --expand-path=\$TEXMFLOCAL`);
+ } else {
+ chomp($TEXMFLOCALVAR =`kpsewhich --expand-path='\$TEXMFLOCAL'`);
+ }
+
my @TEXMFLOCAL = split /:/ , $TEXMFLOCALVAR;
chomp(my $TEXMFHOME =`kpsewhich --var-value=TEXMFHOME`);
if (win32()) {