Mercurial > repos > bgruening > package_r_3_0_1
changeset 9:bae5c9880b71 draft default tip
Uploaded
| author | bgruening |
|---|---|
| date | Fri, 02 Aug 2013 13:15:07 -0400 |
| parents | 4dba1ce455da |
| children | |
| files | tool_dependencies.xml |
| diffstat | 1 files changed, 3 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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>