# HG changeset patch
# User fubar
# Date 1392708569 18000
# Node ID 33fa58860493bdaac2cfff32261f0817efa80a06
# Parent  c161b72d384eba27c59db6b4a1187350b2386a8e
Uploaded

diff -r c161b72d384e -r 33fa58860493 tool_dependencies.xml
--- a/tool_dependencies.xml	Mon Feb 17 18:47:30 2014 -0500
+++ b/tool_dependencies.xml	Tue Feb 18 02:29:29 2014 -0500
@@ -1,43 +1,39 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <package name="readline" version="6.2">
-        <repository changeset_revision="246f31787ca1" name="package_readline_6_2" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
+        <repository changeset_revision="246f31787ca1" name="package_readline_6_2" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="ncurses" version="5.9">
         <repository changeset_revision="f62fa47b852d" name="package_ncurses_5_9" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
     </package>
-    <package name="r302" version="3.0.2">
+    <package name="R_3_0_2" version="3.0.2">
         <install version="1.0">
             <actions>
                 <action type="download_by_url">http://cran.ms.unimelb.edu.au/src/base/R-3/R-3.0.2.tar.gz</action>
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="246f31787ca1" name="package_readline_6_2" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu/">
+                    <repository changeset_revision="246f31787ca1" name="package_readline_6_2" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
                         <package name="readline" version="6.2" />
                     </repository>
                     <repository changeset_revision="f62fa47b852d" name="package_ncurses_5_9" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
                         <package name="ncurses" version="5.9" />
                     </repository>
                 </action>
-                <action type="make_directory">$INSTALL_DIR</action>
+
                 <action type="shell_command">
-                    ./configure --prefix=$INSTALL_DIR CPPFLAGS=-I$READLINE_INCLUDE_PATH LDFLAGS="-L$READLINE_LIB_PATH -L$NCURSES_LIB_PATH -lreadline -lncurses" --enable-R-shlib  --with-x=no 
+                    ./configure CPPFLAGS=-I$READLINE_INCLUDE_PATH LDFLAGS="-L$READLINE_LIB_PATH -L$NCURSES_LIB_PATH -lreadline -lncurses" --enable-R-shlib  --with-x=no --libdir=$INSTALL_DIR/lib/ --prefix=$INSTALL_DIR --datarootdir=$INSTALL_DIR/share/
                 </action>
+                <action type="shell_command">make</action>
+                <action type="shell_command">make install</action>
                 <action type="set_environment">
                     <environment_variable action="set_to" name="R_HOME">$INSTALL_DIR/lib/R</environment_variable>
                     <environment_variable action="set_to" name="R_LIBS">$INSTALL_DIR/lib/R/library</environment_variable>
-                    <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
+                    <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/lib/R/bin</environment_variable>
                     <environment_variable action="append_to" name="LD_LIBRARY_PATH">$INSTALL_DIR/lib/R/lib</environment_variable>
                     <environment_variable action="set_to" name="RHOME">$INSTALL_DIR/lib/R</environment_variable>
-                    <environment_variable action="set_to" name="R_PATH">$INSTALL_DIR/bin</environment_variable>
+                    <environment_variable action="set_to" name="R_PATH">$INSTALL_DIR/lib/R/bin</environment_variable>
                 </action>
             </actions>
         </install>
-        <readme>Modified from an older version of R by Boris by Ross Lazarus for R 3.0
-                Silly having melbourne CRAN hardwired but that's what I test with.
-                Be nice to have interactive variables for fabric installs.
-                R is a free software environment for statistical computing and graphics
-                WARNING: See custom compilation options above
-                
-       </readme>
+        <readme>R is a free software environment for statistical computing and graphics. http://www.r-project.org/</readme>
     </package>
 </tool_dependency>