From 0d07040bb349e0bec9fb6e04ddeeed025766b24e Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Sat, 15 Nov 2008 07:33:51 +0000
Subject: [PATCH] Attempt at fixing errors

---
 pandatool/src/mayaprogs/mayaWrapper.cxx | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pandatool/src/mayaprogs/mayaWrapper.cxx b/pandatool/src/mayaprogs/mayaWrapper.cxx
index de571d718e..5d42c578a5 100644
--- a/pandatool/src/mayaprogs/mayaWrapper.cxx
+++ b/pandatool/src/mayaprogs/mayaWrapper.cxx
@@ -189,18 +189,22 @@ int main(int argc, char **argv)
   sprintf(env3, "PYTHONPATH=%s\\bin;%s\\Python;%s\\Python\\DLLs;%s\\Python\\lib;%s\\Python\\lib\\site-packages", loc, loc, loc, loc, loc);
 #else
   env1 = (char*)malloc(100 + strlen(loc) + strlen(path));
-  sprintf(env1, "PATH=%s/bin;%s", loc, path);
+  sprintf(env1, "PATH=%s/bin:%s", loc, path);
   env2 = (char*)malloc(100 + strlen(loc));
   sprintf(env2, "MAYA_LOCATION=%s", loc);
-  env3 = (char*)malloc(300 + 5*strlen(loc));
-  sprintf(env3, "PYTHONPATH=%s/bin;%s/Python;%s/Python/DLLs;%s/Python/lib;%s/Python/lib/site-packages", loc, loc, loc, loc, loc);
+  env3 = (char*)malloc(200 + 5*strlen(loc));
+  sprintf(env3, "PYTHONPATH=%s/bin:%s/lib:%s/lib/python2.5/site-packages:%s/lib/python2.5/lib-dynload", loc, loc, loc, loc);
+  env4 = (char*)malloc(100 + 5*strlen(loc));
+  sprintf(env4, "PYTHONHOME=%s/lib/python2.5", loc);
   
   path = getenv("LD_LIBRARY_PATH");
   if (path == 0) path = "";
-  env4 = (char*)malloc(100 + strlen(loc) + strlen(path));
-  sprintf(env4, "LD_LIBRARY_PATH=%s/lib:%s", loc, path);
+  env5 = (char*)malloc(100 + strlen(loc) + strlen(path));
+  sprintf(env5, "LD_LIBRARY_PATH=%s/lib:%s", loc, path);
   
-  _putenv(env4);
+  //_putenv(env3);
+  //_putenv(env4);
+  _putenv(env5);
 #endif
   _putenv(env1);
   _putenv(env2);