summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2010-06-01 18:02:18 +0000
committerTaco Hoekwater <taco@elvenkind.com>2010-06-01 18:02:18 +0000
commit864ebb89e0034d532b6bcacb2c5b88bdaef4eee4 (patch)
treecf94aa145e177994e98d116f08c6e32d48d049d6
parent7105fea0703d5eb9e545d0df62967f32100847df (diff)
Update mtxrun.dll to look in its own directory for texlua.exe
when %PATH% is exhausted. git-svn-id: svn://tug.org/texlive/trunk@18678 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/bin/win32/mtxrun.dllbin9216 -> 8192 bytes
-rwxr-xr-xMaster/texmf-dist/scripts/context/stubs/mswin/mtxrun.dllbin9216 -> 8192 bytes
-rw-r--r--Master/texmf-dist/scripts/context/stubs/source/mtxrun_dll.c23
3 files changed, 16 insertions, 7 deletions
diff --git a/Master/bin/win32/mtxrun.dll b/Master/bin/win32/mtxrun.dll
index 23e476cac49..041e1a0e1d0 100755
--- a/Master/bin/win32/mtxrun.dll
+++ b/Master/bin/win32/mtxrun.dll
Binary files differ
diff --git a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.dll b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.dll
index 23e476cac49..041e1a0e1d0 100755
--- a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.dll
+++ b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.dll
Binary files differ
diff --git a/Master/texmf-dist/scripts/context/stubs/source/mtxrun_dll.c b/Master/texmf-dist/scripts/context/stubs/source/mtxrun_dll.c
index 5b7cd31a07b..27841c68764 100644
--- a/Master/texmf-dist/scripts/context/stubs/source/mtxrun_dll.c
+++ b/Master/texmf-dist/scripts/context/stubs/source/mtxrun_dll.c
@@ -113,13 +113,22 @@ __declspec(dllexport) int dllrunscript( int argc, char *argv[] )
// find texlua.exe
if ( !SearchPath(
- getenv( "PATH" ), // path to search (optional)
- "texlua.exe", // file name to search
- NULL, // file extension to add (optional)
- MAX_PATH, // output buffer size
- luatexpath, // output buffer pointer
- &luatexfname ) // pointer to a file part in the output buffer (optional)
- ) DIE( "unable to locate texlua.exe on the search path" );
+ getenv( "PATH" ), // path to search (optional)
+ "texlua.exe", // file name to search
+ NULL, // file extension to add (optional)
+ MAX_PATH, // output buffer size
+ luatexpath, // output buffer pointer
+ &luatexfname ) // pointer to a file part in the output buffer (optional)
+ )
+ if ( !SearchPath(
+ dirpath, // path to search (optional)
+ "texlua.exe", // file name to search
+ NULL, // file extension to add (optional)
+ MAX_PATH, // output buffer size
+ luatexpath, // output buffer pointer
+ &luatexfname ) // pointer to a file part in the output buffer (optional)
+ )
+ DIE( "unable to locate texlua.exe on the search path" );
// link directly with luatex.dll if available in texlua's dir