# HG changeset patch
# User devteam
# Date 1372182600 14400
# Node ID f117a9d9dc9c1dc4e36a3781568e2794ae63486d
# Parent  9fd501d0f295780e5ffef0078969bb392a0842c3
Update the tool_dependencies.xml to use a single <actions> tag set.

diff -r 9fd501d0f295 -r f117a9d9dc9c tool_dependencies.xml
--- a/tool_dependencies.xml	Thu Jun 20 15:18:09 2013 -0400
+++ b/tool_dependencies.xml	Tue Jun 25 13:50:00 2013 -0400
@@ -19,25 +19,17 @@
                         ./configure --prefix=$INSTALL_DIR --x-includes=$X11_INCLUDE_DIR --x-libraries=$X11_LIB_DIR
                     fi
                 </action>
-                <action type="shell_command">make</action>
-                <action type="shell_command">make install</action>
-            </actions>
-            <actions>
-                <action type="download_by_url">ftp://emboss.open-bio.org/pub/EMBOSS/old/5.0.0/PHYLIP-3.6b.tar.gz</action>
-                <action type="set_environment_for_install">
-                    <repository changeset_revision="90c1cbb8095a" name="package_x11_client_1_5_proto_7_0" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu">
-                        <package name="libx11" version="1.5.0" />
-                    </repository>
-                </action>
+                <action type="shell_command">make &amp;&amp; make install</action>
+                <action type="download_file" extract="true">ftp://emboss.open-bio.org/pub/EMBOSS/old/5.0.0/PHYLIP-3.6b.tar.gz</action>
+                <action type="change_directory">PHYLIP-3.6b</action>
                 <action type="shell_command">
                     if [ -z $X11_LIB_DIR ] || [ -z $X11_INCLUDE_DIR ]; then
                         ./configure --prefix=$INSTALL_DIR
                     else
-                        ./configure --prefix=$INSTALL_DIR --x-includes=$X11_INCLUDE_DIR --x-libraries=$X11_LIB_DIR CFLAGS='-I$INSTALL_DIR/include'
+                        ./configure --prefix=$INSTALL_DIR --x-includes=$X11_INCLUDE_DIR --x-libraries=$X11_LIB_DIR CFLAGS='-I../include'
                     fi
                 </action>
-                <action type="shell_command">make</action>
-                <action type="shell_command">make install</action>
+                <action type="shell_command">make &amp;&amp; make install</action>
             </actions>
         </install>
         <readme>
@@ -50,4 +42,4 @@
 http://emboss.sourceforge.net/download/#Platforms
         </readme>
     </package>
-</tool_dependency>
+</tool_dependency>
\ No newline at end of file