# HG changeset patch
# User bgruening
# Date 1378983651 14400
# Node ID b7ff4a8c58dffe158e9d72883999e6e5a93e8ef9
# Parent  793c48909d53172d2f356e37549651899759be42
Uploaded

diff -r 793c48909d53 -r b7ff4a8c58df tool_dependencies.xml
--- a/tool_dependencies.xml	Mon Jul 08 10:18:39 2013 -0400
+++ b/tool_dependencies.xml	Thu Sep 12 07:00:51 2013 -0400
@@ -1,29 +1,36 @@
 <?xml version="1.0"?>
 <tool_dependency>
         <package name="lapack" version="3.4.2">
-            <repository changeset_revision="a6b8f46acca7" name="package_lapack_3_4" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+            <repository changeset_revision="60957bd68fe2" name="package_lapack_3_4" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
         </package>
         <package name="atlas" version="3.10.1">
-            <repository changeset_revision="25dc49b0d6d5" name="package_atlas_3_10" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+            <repository changeset_revision="2f75622926c5" name="package_atlas_3_10" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
         </package>
         <package name="numpy" version="1.7.1">
             <install version="1.0">
                 <actions>
                     <action type="download_by_url">https://pypi.python.org/packages/source/n/numpy/numpy-1.7.1.tar.gz</action>
                     <action type="set_environment_for_install">
-                        <repository changeset_revision="25dc49b0d6d5" name="package_atlas_3_10" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                        <repository changeset_revision="2f75622926c5" name="package_atlas_3_10" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
                             <package name="atlas" version="3.10.1" />
                         </repository>
-                        <repository changeset_revision="a6b8f46acca7" name="package_lapack_3_4" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                        <repository changeset_revision="60957bd68fe2" name="package_lapack_3_4" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
                             <package name="lapack" version="3.4.2" />
                         </repository>
                     </action>
                     <action type="make_directory">$INSTALL_DIR/lib/python</action>
-                    <action type="shell_command">export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python &amp;&amp; 
-                    export BLAS=$LAPACK_LIB_DIR/libblas.a &amp;&amp; 
-                    export LAPACK=$LAPACK_LIB_DIR/liblapack.a &amp;&amp; 
-                    export ATLAS=$ATLAS_LIB_DIR/libatlas.a &amp;&amp; 
-                    python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin</action>
+                    <action language="cheetah" type="template_command">
+                    export PYTHONPATH=\$PYTHONPATH:$env.INSTALL_DIR/lib/python &amp;&amp; 
+                    
+                    #if env.get('ATLAS_LIB_DIR', False):
+                        export ATLAS=$env.ATLAS_LIB_DIR/libatlas.a &amp;&amp; 
+                    #end if
+                    #if env.get('LAPACK_LIB_DIR', False):
+                        export BLAS=$env.LAPACK_LIB_DIR/libblas.a &amp;&amp; 
+                        export LAPACK=$env.LAPACK_LIB_DIR/liblapack.a &amp;&amp; 
+                    #end if
+                    python setup.py install --install-lib $env.INSTALL_DIR/lib/python --install-scripts $env.INSTALL_DIR/bin
+                    </action>
                     <action type="set_environment">
                         <environment_variable action="append_to" name="PYTHONPATH">$INSTALL_DIR/lib/python</environment_variable>
                         <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>