[cig-commits] r18087 - cs/buildbot/pylith_deps

[brad at geodynamics.org]

Author: brad
Date: 2011-03-09 15:25:43 -0800 (Wed, 09 Mar 2011)
New Revision: 18087

Modified:
   cs/buildbot/pylith_deps/bashrc
Log:
Make bashrc more portable.

Modified: cs/buildbot/pylith_deps/bashrc
===================================================================
--- cs/buildbot/pylith_deps/bashrc	2011-03-09 23:18:17 UTC (rev 18086)
+++ cs/buildbot/pylith_deps/bashrc	2011-03-09 23:25:43 UTC (rev 18087)
@@ -1,7 +1,7 @@
 export BUILDBOT=pylith_linux_x86_64_binbot
 export PYTHON_VERSION=2.6
 
-PYLITHDEPS_DIR=${HOME}/pylith_deps/tools
+PYLITHDEPS_DIR=${HOME}/pylith_deps
 PATH=${PYLITHDEPS_DIR}/bin:${PATH}
 export LD_LIBRARY_PATH=${PYLITHDEPS_DIR}/lib
 export PYTHONPATH=${PYLITHDEPS_DIR}/lib/python${PYTHON_VERSION}/site-packages
@@ -9,6 +9,11 @@
 
 BUILDBOT_INSTALL=${HOME}/install/${BUILDBOT}
 PATH=${BUILDBOT_INSTALL}/bin:${PATH}
-export LD_LIBRARY_PATH=${BUILDBOT_INSTALL}/lib:${BUILDBOT_INSTALL}/lib64
-export PYTHONPATH=${BUILDBOT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages
+export LD_LIBRARY_PATH=${BUILDBOT_INSTALL}/lib:${BUILDBOT_INSTALL}/lib64:${LD_LIBRARY_PATH}
+export PYTHONPATH=${BUILDBOT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:${PYTHONPATH}
 unset BUILDBOT_INSTALL
+
+if [ "${BUILDBOT}" == "pylith_darwin_10.4_binbot" ] || [ ${BUILDBOT} == "pylith_darwin_10.6_binbot" ]; then
+  export DYLD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${DYLD_LIBRARY_PATH}
+  unset LD_LIBRARY_PATH
+fi