# HG changeset patch
# User fubar
# Date 1392613037 18000
# Node ID 9d66ba7f1d9b741fdf32ccb8b9b9e335df840d33
# Parent  e5d9e2ca3ba6775b433972c8289481385b31e79d
Uploaded

diff -r e5d9e2ca3ba6 -r 9d66ba7f1d9b tool_dependencies.xml
--- a/tool_dependencies.xml	Sun Feb 09 22:31:00 2014 -0500
+++ b/tool_dependencies.xml	Sun Feb 16 23:57:17 2014 -0500
@@ -1,23 +1,34 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <package name="readline" version="6.2">
-        <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" 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">
         <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" prior_installation_required="True" 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 --with-blas --with-lapack --enable-R-shlib  --with-x=no --prefix=$INSTALL_DIR &amp;&amp; make &amp;&amp; make install</action>
+                <action type="shell_command">
+                    ./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/ --bindir=$INSTALL_DIR/bin/ --datarootdir=$INSTALL_DIR/share/
+                </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/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/lib/R/bin</environment_variable>
                 </action>
             </actions>
         </install>