From 5d7cf87d822adf8d485e96f01ce7cacf099ec9a3 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Wed, 1 Dec 2010 20:38:26 +0000
Subject: [PATCH] committed (admittedly) untested changes for batch files to
 respect %MAKEPANDA_THIRDPARTY%

---
 makepanda/expandimports.bat |  7 +++++--
 makepanda/makechm.bat       |  7 +++++--
 makepanda/makedocs.bat      |  7 +++++--
 makepanda/makepanda.bat     | 11 +++++++----
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/makepanda/expandimports.bat b/makepanda/expandimports.bat
index a8cfcd1a8b..ee2dcc6c3e 100644
--- a/makepanda/expandimports.bat
+++ b/makepanda/expandimports.bat
@@ -6,9 +6,12 @@ REM and the python interpreter.  If we can find both, then
 REM run 'expandimports'.
 REM
 
+set thirdparty=thirdparty
+if defined MAKEPANDA_THIRDPARTY set thirdparty=%MAKEPANDA_THIRDPARTY%
+
 if not exist makepanda\expandimports.py goto :missing1
-if not exist thirdparty\win-python\python.exe goto :missing2
-thirdparty\win-python\python.exe makepanda\expandimports.py %*
+if not exist %thirdparty%\win-python\python.exe goto :missing2
+%thirdparty%\win-python\python.exe makepanda\expandimports.py %*
 goto done
 
 :missing1
diff --git a/makepanda/makechm.bat b/makepanda/makechm.bat
index bd4a636b74..5a4b1b38e1 100755
--- a/makepanda/makechm.bat
+++ b/makepanda/makechm.bat
@@ -6,9 +6,12 @@ REM and the python interpreter.  If we can find both, then
 REM run 'makechm'.
 REM
 
+set thirdparty=thirdparty
+if defined MAKEPANDA_THIRDPARTY set thirdparty=%MAKEPANDA_THIRDPARTY%
+
 if not exist makepanda\makechm.py goto :missing1
-if not exist thirdparty\win-python\python.exe goto :missing2
-thirdparty\win-python\python.exe makepanda\makechm.py %*
+if not exist %thirdparty%\win-python\python.exe goto :missing2
+%thirdparty%\win-python\python.exe makepanda\makechm.py %*
 goto done
 
 :missing1
diff --git a/makepanda/makedocs.bat b/makepanda/makedocs.bat
index 7915f7e87f..c628e2ec81 100644
--- a/makepanda/makedocs.bat
+++ b/makepanda/makedocs.bat
@@ -6,9 +6,12 @@ REM and the python interpreter.  If we can find both, then
 REM run 'makedocs'.
 REM
 
+set thirdparty=thirdparty
+if defined MAKEPANDA_THIRDPARTY set thirdparty=%MAKEPANDA_THIRDPARTY%
+
 if not exist makepanda\makedocs.py goto :missing1
-if not exist thirdparty\win-python\python.exe goto :missing2
-thirdparty\win-python\python.exe makepanda\makedocs.py %*
+if not exist %thirdparty%\win-python\python.exe goto :missing2
+%thirdparty%\win-python\python.exe makepanda\makedocs.py %*
 goto done
 
 :missing1
diff --git a/makepanda/makepanda.bat b/makepanda/makepanda.bat
index 4999577a77..1ffa327355 100755
--- a/makepanda/makepanda.bat
+++ b/makepanda/makepanda.bat
@@ -6,17 +6,20 @@ REM and the python interpreter.  If we can find both, then
 REM run 'makepanda'.
 REM
 
+set thirdparty=thirdparty
+if defined MAKEPANDA_THIRDPARTY set thirdparty=%MAKEPANDA_THIRDPARTY%
+
 if not exist makepanda\makepanda.py goto :missing1
 if %PROCESSOR_ARCHITECTURE% == AMD64 goto :AMD64
 
-if not exist thirdparty\win-python\python.exe goto :missing2
-thirdparty\win-python\python.exe makepanda\makepanda.py %*
+if not exist %thirdparty%\win-python\python.exe goto :missing2
+%thirdparty%\win-python\python.exe makepanda\makepanda.py %*
 if errorlevel 1 if x%1 == x--slavebuild exit 1
 goto done
 
 :AMD64
-if not exist thirdparty\win-python-x64\python.exe goto :missing2
-thirdparty\win-python-x64\python.exe makepanda\makepanda.py %*
+if not exist %thirdparty%\win-python-x64\python.exe goto :missing2
+%thirdparty%\win-python-x64\python.exe makepanda\makepanda.py %*
 if errorlevel 1 if x%1 == x--slavebuild exit 1
 goto done