summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorVladimir Volovich <vvv@vsu.ru>2011-06-23 14:25:51 +0000
committerVladimir Volovich <vvv@vsu.ru>2011-06-23 14:25:51 +0000
commite5dd37a8983b5c2c9359b7661e07503a8f3a79a6 (patch)
tree23ee1ecac93d48cfeb7bd4f8dc2cb0d23d60b842 /Master
parentc4dc06a18ec906e9a7e4642b1e9636341a2e9e44 (diff)
re-sync powerpc-aix/mtxrun - commit from last rebuild included an older version; also re-sync i386-netbsd/tpic2pdftex which is somehow outdated
git-svn-id: svn://tug.org/texlive/trunk@23108 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/bin/i386-netbsd/tpic2pdftex4
-rwxr-xr-xMaster/bin/powerpc-aix/mtxrun5
2 files changed, 7 insertions, 2 deletions
diff --git a/Master/bin/i386-netbsd/tpic2pdftex b/Master/bin/i386-netbsd/tpic2pdftex
index 16fef2c8fff..412dc0d771f 100755
--- a/Master/bin/i386-netbsd/tpic2pdftex
+++ b/Master/bin/i386-netbsd/tpic2pdftex
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $Id: tpic2pdftex,v 1.97 2010/01/16 11:51:43 hahe Exp $
+# $Id: tpic2pdftex 22938 2011-06-12 22:03:14Z karl $
#
# Experimental awk-script for conversion of tpic \specials as produced
# by (groff-)pic into pdfTeX \pdfliteral sections for further processing
@@ -40,6 +40,8 @@
# hartmut_henkel@gmx.de
#
# NEWS:
+# 11 Jun. 2011 - sh construct portability
+# (patch from Nelson Beebe)
# 24 Dec. 2009 - use gawk for default awk only if it exists
# (patch by Karl Berry).
# 14 Jan. 2007 - make it executable shell script, calling awk
diff --git a/Master/bin/powerpc-aix/mtxrun b/Master/bin/powerpc-aix/mtxrun
index 8debdf95551..7adcd3023a8 100755
--- a/Master/bin/powerpc-aix/mtxrun
+++ b/Master/bin/powerpc-aix/mtxrun
@@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
if doscan then files = resolvers.scanfiles(ppname) end
for k=1,#wantedfiles do
local w = wantedfiles[k]
- local subpath = files[w] or ''
+ local subpath = ''
+ if files[w] then
+ subpath = type(files[w]) == "table" and files[w][1] or files[w]
+ end
local fname = filejoin(ppname,subpath,w)
if isreadable(fname) then
if trace_detail then