# HG changeset patch # User Bjoern Gruening # Date 1374503181 -7200 # Node ID 0a80636e2735a14a9628534eaae61e1c87f74ad1 # Parent 44cfb15ca61a263f4321c925bcb3cd4bb38964d6 ChemicalToolBoX update. diff -r 44cfb15ca61a -r 0a80636e2735 tool_dependencies.xml --- a/tool_dependencies.xml Mon Jul 22 16:00:26 2013 +0200 +++ b/tool_dependencies.xml Mon Jul 22 16:26:21 2013 +0200 @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ http://downloads.sourceforge.net/project/scipy/scipy/0.12.0/scipy-0.12.0.tar.gz - + @@ -25,13 +25,22 @@ $INSTALL_DIR/lib/python - export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python && - export BLAS=$LAPACK_LIB_DIR/libblas.a && - export LAPACK=$LAPACK_LIB_DIR/liblapack.a && - export ATLAS=$ATLAS_LIB_DIR/libatlas.a && + + export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python && + + + #if env.get('ATLAS_LIB_DIR', False): + export ATLAS=$ATLAS_LIB_DIR/libatlas.a && + #end if + #if env.get('LAPACK_LIB_DIR', False): + export BLAS=$LAPACK_LIB_DIR/libblas.a && + export LAPACK=$LAPACK_LIB_DIR/liblapack.a && + #end if + export PATH=$PATH:$PATH_NUMPY && export PYTHONPATH=$PYTHONPATH:$PYTHONPATH_NUMPY && - python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin + python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin + $INSTALL_DIR/lib/python $INSTALL_DIR/bin @@ -44,4 +53,4 @@ Compiling scipy requires a C and Fortran compiler (typically gcc and gfortran). The PYTHONPATH for scipy can be accessed through PYTHONPATH_SCIPY and the binaries with PATH_SCIPY. - + \ No newline at end of file