# HG changeset patch
# User bgruening
# Date 1375463707 14400
# Node ID bae5c9880b7177b2aaefb1d32bb59a1c6d2d71c7
# Parent  4dba1ce455da578c165216f668738ed4c3c0c382
Uploaded

diff -r 4dba1ce455da -r bae5c9880b71 tool_dependencies.xml
--- a/tool_dependencies.xml	Fri Aug 02 07:32:53 2013 -0400
+++ b/tool_dependencies.xml	Fri Aug 02 13:15:07 2013 -0400
@@ -33,7 +33,7 @@
                         #set $cmd += ' --with-readline=no '
                     #end if
 
-                    #set $cmd += ' --enable-R-shlib  --with-x=no --libdir=%s/lib/ --bindir=%s/bin/ --rsharedir=%s/share/' % ($env.INSTALL_DIR, $env.INSTALL_DIR, $env.INSTALL_DIR)
+                    #set $cmd += ' --enable-R-shlib  --with-x=no --libdir=%s/lib/ --bindir=%s/bin/ --datarootdir=%s/share/' % ($env.INSTALL_DIR, $env.INSTALL_DIR, $env.INSTALL_DIR)
                     $cmd
                 </action>
                 <action type="shell_command">make</action>
@@ -43,12 +43,8 @@
                     <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>
-
-export RHOME=$R_HOME
-export R_PATH=$R_HOME/bin
-
+                    <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>