sync

git-svn-id: svn://tug.org/texlive/trunk@23035 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 6 insertions, 8 deletions

diff --git a/Master/texmf/scripts/tetex/updmap.pl b/Master/texmf/scripts/tetex/updmap.pl
index ae22fb2e83a..2f988ca926a 100755
--- a/Master/texmf/scripts/tetex/updmap.pl
+++ b/Master/texmf/scripts/tetex/updmap.pl
@@ -12,7 +12,7 @@ BEGIN {
   unshift (@INC, "$TEXMFROOT/tlpkg");
 }
 
-my $version = '$Id: updmap.pl 23018 2011-06-16 20:35:36Z karl $';
+my $version = '$Id: updmap.pl 23034 2011-06-17 23:44:39Z karl $';
 
 use strict;
 use TeXLive::TLUtils qw(mkdirhier mktexupd win32);
@@ -464,24 +464,22 @@ sub locateWeb2c {
 
 ###############################################################################
 # locateMap (file ...)
-#   apply kpsewhich with format 'dvips config'
+#   apply kpsewhich with format 'map'
 #
 sub locateMap {
   my @maps = @_;
-  my @files;
-
   return @maps if ($#maps < 0);
 
-  @files = `kpsewhich --format=map @maps`;
+  my @files = `kpsewhich --format=map @maps`;
   chomp @files;
 
   foreach my $map (@maps) {
-    push @missing, $map if (! grep /\/$map$/, @files);
+    push @missing, $map if (! grep /\/$map(\.map)?$/, @files);
   }
+
   if (wantarray) {
     return @files;
-  }
-  else {
+  } else {
     return $files[0];
   }
 }