Mercurial > repos > bgruening > package_r_3_0_1

changeset 4:abd431ea5ce0 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author bgruening
date Wed, 10 Jul 2013 16:38:56 -0400
parents 8dc463c6cbe8
children baa2b5c8c409
files tool_dependencies.xml
diffstat 1 files changed, 11 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Wed Jul 10 15:27:05 2013 -0400
+++ b/tool_dependencies.xml	Wed Jul 10 16:38:56 2013 -0400
@@ -21,18 +21,21 @@
                 </action>
 
                 <action language="cheetah" type="template_command">
-                    export LDFLAGS=-L$env.READLINE_LIB_PATH &amp;&amp; 
-                    export CPPFLAGS=-I$env.READLINE_INCLUDE_PATH &amp;&amp; 
-                    
+                    #if env.get('READLINE_LIB_PATH', False):
+                        export LDFLAGS=-L$env.READLINE_LIB_PATH &amp;&amp; 
+                        export CPPFLAGS=-I$env.READLINE_INCLUDE_PATH &amp;&amp; 
+                    #end if
+
                     #set $cmd = './configure'
                     #if env.get('ATLAS_LIB_DIR', False):
-                        #$cmd += '--with-blas="-L$env.ATLAS_LIB_DIR -lptf77blas -lpthread -latlas" '
+                        #set $cmd += ' --with-blas="-L%s -lptf77blas -lpthread -latlas" ' % $env.ATLAS_LIB_DIR
                     #end if
-                    
-                    #$cmd += '--enable-R-shlib  --with-x=no --with-readline=yes --prefix=$env.INSTALL_DIR'
-                    
-                    $cmd &amp;&amp; make &amp;&amp; make install
+
+                    #set $cmd += ' --enable-R-shlib  --with-x=no --with-readline=yes --prefix=%s ' % $env.INSTALL_DIR
+                    $cmd
                 </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>