# HG changeset patch
# User greg
# Date 1468330606 14400
# Node ID 37a6491da3ed7ab1aef0698af82da9cf5d4eafa6
# Parent  283b9344e7c4063b0113b64f753eb57e6459200a
Uploaded

diff -r 283b9344e7c4 -r 37a6491da3ed tool_dependencies.xml
--- a/tool_dependencies.xml	Tue Jul 12 09:19:19 2016 -0400
+++ b/tool_dependencies.xml	Tue Jul 12 09:36:46 2016 -0400
@@ -31,7 +31,7 @@
                             export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &&
                             cmake \
                             -DCMAKE_BUILD_TYPE:STRING=Release \
-                            -DCMAKE_INSTALL_PREFIX:PATH=`pwd`/../build \
+                            -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_DIR/vtk \
                             -DVTK_WRAP_PYTHON:BOOL=ON \
                             -DVTK_Group_StandAlone:BOOL=OFF \
                             -DVTK_Group_Rendering:BOOL=OFF \
@@ -63,18 +63,6 @@
                             make install
                         
                     </action>
-                     <action type="move_directory_files">
-                         <source_directory>../build/bin</source_directory>
-                         <destination_directory>$INSTALL_DIR/bin</destination_directory>
-                     </action>
-                     <action type="move_directory_files">
-                         <source_directory>../build/include</source_directory>
-                         <destination_directory>$INSTALL_DIR/include</destination_directory>
-                     </action>
-                     <action type="move_directory_files">
-                         <source_directory>../build/lib</source_directory>
-                         <destination_directory>$INSTALL_DIR/lib</destination_directory>
-                     </action>
 
                     <!-- Install and compile icqsol version 1.0 as a package in the above Python -->
                     <action type="make_directory">$TMP_WORK_DIR/icqsol</action>
@@ -83,7 +71,7 @@
                     <action type="change_directory">icqsol</action>
                     <action type="shell_command">
                         
-                            export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
+                            export PATH=$INSTALL_DIR/vtk/bin:$PATH &amp;&amp;
                             export VTK_INCLUDE_DIR=$INSTALL_DIR/vtk/include/vtk-6.3 &amp;&amp;
                             export VTK_LIBRARY_DIR=$INSTALL_DIR/vtk/lib &amp;&amp;
                             $INSTALL_DIR/bin/python setup.py develop --prefix=$INSTALL_DIR
@@ -126,7 +114,7 @@
                             export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &amp;&amp;
                             cmake \
                             -DCMAKE_BUILD_TYPE:STRING=Release \
-                            -DCMAKE_INSTALL_PREFIX:PATH=`pwd`/../build \
+                            -DCMAKE_INSTALL_PREFIX:PATH==$INSTALL_DIR/vtk \
                             -DVTK_WRAP_PYTHON:BOOL=ON \
                             -DVTK_Group_StandAlone:BOOL=OFF \
                             -DVTK_Group_Rendering:BOOL=OFF \
@@ -158,18 +146,6 @@
                             make install
                         
                     </action>
-                     <action type="move_directory_files">
-                         <source_directory>../build/bin</source_directory>
-                         <destination_directory>$INSTALL_DIR/bin</destination_directory>
-                     </action>
-                     <action type="move_directory_files">
-                         <source_directory>../build/include</source_directory>
-                         <destination_directory>$INSTALL_DIR/include</destination_directory>
-                     </action>
-                     <action type="move_directory_files">
-                         <source_directory>../build/lib</source_directory>
-                         <destination_directory>$INSTALL_DIR/lib</destination_directory>
-                     </action>
 
                     <!-- Install and compile icqsol version 1.0 as a package in the above Python -->
                     <action type="make_directory">$TMP_WORK_DIR/icqsol</action>
@@ -178,7 +154,7 @@
                     <action type="change_directory">icqsol</action>
                     <action type="shell_command">
                         
-                            export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
+                            export PATH=$INSTALL_DIR/vtk/bin:$PATH &amp;&amp;
                             export VTK_INCLUDE_DIR=$INSTALL_DIR/vtk/include/vtk-6.3 &amp;&amp;
                             export VTK_LIBRARY_DIR=$INSTALL_DIR/vtk/lib &amp;&amp;
                             $INSTALL_DIR/bin/python setup.py develop --prefix=$INSTALL_DIR &amp;&amp;