[Yt-svn] yt-commit r1319 - branches/yt-1.5/doc trunk/doc

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Wed Jun  3 09:29:25 2009
New Revision: 1319
URL: http://yt.spacepope.org/changeset/1319

Log:
Added Abe-specific LDFLAGS handling.



Modified:
   branches/yt-1.5/doc/install_script.sh
   trunk/doc/install_script.sh

Modified: branches/yt-1.5/doc/install_script.sh
==============================================================================
--- branches/yt-1.5/doc/install_script.sh	(original)
+++ branches/yt-1.5/doc/install_script.sh	Wed Jun  3 09:29:25 2009
@@ -91,6 +91,13 @@
         echo "   $ module load mvapich-devel"
         echo
     fi
+    if [ "${MYHOST##honest}" != "${MYHOST}" ]
+    then
+        echo "Looks like you're on Abe."
+        echo "We're going to have to set some supplemental environment"
+		echo "variables to get this to work..."
+		MPL_SUPP_LDFLAGS="-L${DEST_DIR}/lib -L${DEST_DIR}/lib64 -L/usr/local/lib64 -L/usr/local/lib"
+    fi
 }
 
 
@@ -299,7 +306,14 @@
 ( ${DEST_DIR}/bin/python2.6 ${YT_DIR}/ez_setup.py 2>&1 ) 1>> ${LOG_FILE} || do_exit
 
 do_setup_py numpy-1.2.1 ${NUMPY_ARGS}
+
+if [ -n "${MPL_SUPP_LDFLAGS}" ]
+then
+    export LDFLAGS="${MPL_SUPP_LDFLAGS}"
+    echo "Setting LDFLAGS ${LDFLAGS}"
+fi
 do_setup_py matplotlib-0.98.5.2
+unset LDFLAGS
 do_setup_py ipython-0.9.1
 do_setup_py h5py-1.1.0
 

Modified: trunk/doc/install_script.sh
==============================================================================
--- trunk/doc/install_script.sh	(original)
+++ trunk/doc/install_script.sh	Wed Jun  3 09:29:25 2009
@@ -91,6 +91,13 @@
         echo "   $ module load mvapich-devel"
         echo
     fi
+    if [ "${MYHOST##honest}" != "${MYHOST}" ]
+    then
+        echo "Looks like you're on Abe."
+        echo "We're going to have to set some supplemental environment"
+		echo "variables to get this to work..."
+		MPL_SUPP_LDFLAGS="-L${DEST_DIR}/lib -L${DEST_DIR}/lib64 -L/usr/local/lib64 -L/usr/local/lib"
+    fi
 }
 
 
@@ -299,7 +306,14 @@
 ( ${DEST_DIR}/bin/python2.6 ${YT_DIR}/ez_setup.py 2>&1 ) 1>> ${LOG_FILE} || do_exit
 
 do_setup_py numpy-1.2.1 ${NUMPY_ARGS}
+
+if [ -n "${MPL_SUPP_LDFLAGS}" ]
+then
+    export LDFLAGS="${MPL_SUPP_LDFLAGS}"
+    echo "Setting LDFLAGS ${LDFLAGS}"
+fi
 do_setup_py matplotlib-0.98.5.2
+unset LDFLAGS
 do_setup_py ipython-0.9.1
 do_setup_py h5py-1.1.0