# HG changeset patch
# User bgruening
# Date 1394937669 14400
# Node ID c8aecd67e0f56ce3755fdcc8fdd0c2ebefc87c8d
# Parent  d5188682d08e0794bcf363c73a7a8526eea2eda9
Uploaded

diff -r d5188682d08e -r c8aecd67e0f5 tool_dependencies.xml
--- a/tool_dependencies.xml	Sun Mar 02 22:44:12 2014 -0500
+++ b/tool_dependencies.xml	Sat Mar 15 22:41:09 2014 -0400
@@ -2,19 +2,22 @@
     <package name="bzlib" version="1.0.6">
         <install version="1.0">
             <actions>
+                <!-- first action is always downloading -->
                 <action type="download_by_url">http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz</action>
                 <action type="shell_command">make</action>
-                <action type="shell_command">make install PREFIX=$INSTALL_DIR</action>
+                <action type="shell_command">make install PREFIX=$INSTALL_DIR/bzlib</action>
+                <action type="move_directory_files">
+                    <source_directory>./</source_directory>
+                    <destination_directory>$INSTALL_DIR/bzlib/source</destination_directory>
+                </action>
                 <action type="set_environment">
-
-                    <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
-                    <environment_variable action="prepend_to" name="LIBRARY_PATH">$INSTALL_DIR/lib</environment_variable>
-                    <environment_variable action="prepend_to" name="LD_LIBRARY_PATH">$INSTALL_DIR/lib</environment_variable>
-                    <environment_variable action="prepend_to" name="CPLUS_INCLUDE_PATH">$INSTALL_DIR/include</environment_variable>
-                    <environment_variable name="BZLIB_ROOT_PATH" action="set_to">$INSTALL_DIR</environment_variable>
+                    <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/bzlib/bin</environment_variable>
+                    <environment_variable name="BZLIB_LIB_DIR" action="set_to">$INSTALL_DIR/bzlib/lib</environment_variable>
+                    <environment_variable name="BZLIB_INCLUDE_DIR" action="set_to">$INSTALL_DIR/bzlib/include</environment_variable>
+                    <environment_variable name="BZLIB_SOURCE_DIR" action="set_to">$INSTALL_DIR/bzlib/source</environment_variable>
                 </action>
             </actions>
         </install>
-        <readme>Compiling bzlib requires make and a C compiler.</readme>
+        <readme>Compiling bzlib requires make and a C compiler. You can access bzlib with $BZLIB_LIB_DIR and $BZLIB_INCLUDE_DIR.</readme>
     </package>
 </tool_dependency>