# HG changeset patch
# User Bjoern Gruening <bjoern.gruening@gmail.com>
# Date 1374505505 -7200
# Node ID 62fda117ad4acb16a83b185cc24b6530ad6b0b91
# Parent  ad6ebe2c75ef3e3884a35ec02d2898498c1aca56
ChemicalToolBoX update.

diff -r ad6ebe2c75ef -r 62fda117ad4a tool_dependencies.xml
--- a/tool_dependencies.xml	Wed May 29 17:05:16 2013 +0200
+++ b/tool_dependencies.xml	Mon Jul 22 17:05:05 2013 +0200
@@ -4,14 +4,14 @@
             <repository changeset_revision="a6b8f46acca7" name="package_lapack_3_4" owner="bgruening" 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="68df9078bf69" name="package_atlas_3_10" owner="bgruening" 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="68df9078bf69" name="package_atlas_3_10" owner="bgruening" 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/">
@@ -19,11 +19,18 @@
                         </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:$INSTALL_DIR/lib/python &amp;&amp; 
+                    
+                    #if env.get('ATLAS_LIB_DIR', False):
+                        export ATLAS=$ATLAS_LIB_DIR/libatlas.a &amp;&amp; 
+                    #end if
+                    #if env.get('LAPACK_LIB_DIR', False):
+                        export BLAS=$LAPACK_LIB_DIR/libblas.a &amp;&amp; 
+                        export LAPACK=$LAPACK_LIB_DIR/liblapack.a &amp;&amp; 
+                    #end if
+                    python setup.py install --home $INSTALL_DIR --install-scripts $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>
@@ -32,6 +39,6 @@
                         </action>
                 </actions>
             </install>
-            <readme>Compiling numpy requires a C and Fortran compiler (typically gcc and gfortran). The PYTHONPATH for numpy can be accessed through PYTHONPATH_NUMPYand the binaries with PATH_NUMPY.</readme>
+            <readme>Compiling numpy requires a C and Fortran compiler (typically gcc and gfortran). The PYTHONPATH for numpy can be accessed through PYTHONPATH_NUMPY and the binaries with PATH_NUMPY.</readme>
         </package>
 </tool_dependency>
\ No newline at end of file