update generate scripts

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

3 files changed, 34 insertions, 10 deletions

diff --git a/Master/bin/win32/generate-fmtutil.texlua b/Master/bin/win32/generate-fmtutil.texlua
index efa451eb423..b639dad34eb 100755
--- a/Master/bin/win32/generate-fmtutil.texlua
+++ b/Master/bin/win32/generate-fmtutil.texlua
@@ -1,6 +1,6 @@
-#!/xusr/bin/env texlua
+#!/usr/bin/env texlua
 --*-Lua-*-
--- $Id: generate-updmap.fmtutil 6485 2008-02-01 20:15:06Z reinhardk $
+-- $Id: generate-fmtutil.texlua 6485 2008-02-01 20:15:06Z reinhardk $
 
 -- Copyright (C) 2007 2008 Reinhard Kotucha, Norbert Preining
 -- You may freely use, modify and/or distribute this file.
@@ -24,9 +24,16 @@ kpse.set_program_name(basename)
 
 TEXDIR=kpse.var_value("SELFAUTOPARENT")
 
-os.setenv("PERL5LIB", TEXDIR.."/tlpkg/tlperl/lib")
+-- if we are on win32 we have to use the shipped perl
+ostype = os.getenv("OS")
+perlbin="perl"
+if (ostype) then
+  if string.find(ostype, "Windows") then
+    os.setenv("PERL5LIB", TEXDIR.."/tlpkg/tlperl/lib")
+    perlbin=TEXDIR.."/tlpkg/tlperl/bin/perl.exe"
+  end
+end
 
-perlbin=TEXDIR.."/tlpkg/tlperl/bin/perl.exe"
 script=kpse.find_file(basename..".pl", "texmfscripts")
 
 command={perlbin, script}
@@ -37,3 +44,4 @@ end
 
 ret=os.spawn(command)
 os.exit(ret)
+
diff --git a/Master/bin/win32/generate-language.texlua b/Master/bin/win32/generate-language.texlua
index 1180c984881..3acd87edc46 100755
--- a/Master/bin/win32/generate-language.texlua
+++ b/Master/bin/win32/generate-language.texlua
@@ -1,4 +1,4 @@
-#!/xusr/bin/env texlua
+#!/usr/bin/env texlua
 --*-Lua-*-
 -- $Id: generate-language.texlua 6485 2008-02-01 20:15:06Z reinhardk $
 
@@ -24,9 +24,16 @@ kpse.set_program_name(basename)
 
 TEXDIR=kpse.var_value("SELFAUTOPARENT")
 
-os.setenv("PERL5LIB", TEXDIR.."/tlpkg/tlperl/lib")
+-- if we are on win32 we have to use the shipped perl
+ostype = os.getenv("OS")
+perlbin="perl"
+if (ostype) then
+  if string.find(ostype, "Windows") then
+    os.setenv("PERL5LIB", TEXDIR.."/tlpkg/tlperl/lib")
+    perlbin=TEXDIR.."/tlpkg/tlperl/bin/perl.exe"
+  end
+end
 
-perlbin=TEXDIR.."/tlpkg/tlperl/bin/perl.exe"
 script=kpse.find_file(basename..".pl", "texmfscripts")
 
 command={perlbin, script}
@@ -37,3 +44,4 @@ end
 
 ret=os.spawn(command)
 os.exit(ret)
+
diff --git a/Master/bin/win32/generate-updmap.texlua b/Master/bin/win32/generate-updmap.texlua
index ca362add834..321b385f6b9 100755
--- a/Master/bin/win32/generate-updmap.texlua
+++ b/Master/bin/win32/generate-updmap.texlua
@@ -1,4 +1,4 @@
-#!/xusr/bin/env texlua
+#!/usr/bin/env texlua
 --*-Lua-*-
 -- $Id: generate-updmap.texlua 6485 2008-02-01 20:15:06Z reinhardk $
 
@@ -24,9 +24,16 @@ kpse.set_program_name(basename)
 
 TEXDIR=kpse.var_value("SELFAUTOPARENT")
 
-os.setenv("PERL5LIB", TEXDIR.."/tlpkg/tlperl/lib")
+-- if we are on win32 we have to use the shipped perl
+ostype = os.getenv("OS")
+perlbin="perl"
+if (ostype) then
+  if string.find(ostype, "Windows") then
+    os.setenv("PERL5LIB", TEXDIR.."/tlpkg/tlperl/lib")
+    perlbin=TEXDIR.."/tlpkg/tlperl/bin/perl.exe"
+  end
+end
 
-perlbin=TEXDIR.."/tlpkg/tlperl/bin/perl.exe"
 script=kpse.find_file(basename..".pl", "texmfscripts")
 
 command={perlbin, script}
@@ -37,3 +44,4 @@ end
 
 ret=os.spawn(command)
 os.exit(ret)
+