[Rcpp-commits] r2457 - in pkg/Rcpp/inst/unitTests: RcppTestA/src testRcppModule testRcppModule/src

[noreply at r-forge.r-project.org]

Author: romain
Date: 2010-11-19 08:32:38 +0100 (Fri, 19 Nov 2010)
New Revision: 2457

Modified:
   pkg/Rcpp/inst/unitTests/RcppTestA/src/Makevars
   pkg/Rcpp/inst/unitTests/testRcppModule/DESCRIPTION
   pkg/Rcpp/inst/unitTests/testRcppModule/src/Makevars
Log:
new PKG_LIBS scheme

Modified: pkg/Rcpp/inst/unitTests/RcppTestA/src/Makevars
===================================================================
--- pkg/Rcpp/inst/unitTests/RcppTestA/src/Makevars	2010-11-19 07:26:53 UTC (rev 2456)
+++ pkg/Rcpp/inst/unitTests/RcppTestA/src/Makevars	2010-11-19 07:32:38 UTC (rev 2457)
@@ -1,2 +1,2 @@
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" )
+PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"`

Modified: pkg/Rcpp/inst/unitTests/testRcppModule/DESCRIPTION
===================================================================
--- pkg/Rcpp/inst/unitTests/testRcppModule/DESCRIPTION	2010-11-19 07:26:53 UTC (rev 2456)
+++ pkg/Rcpp/inst/unitTests/testRcppModule/DESCRIPTION	2010-11-19 07:32:38 UTC (rev 2457)
@@ -10,5 +10,4 @@
 LazyLoad: yes
 Depends: methods, Rcpp (>= 0.8.5)
 LinkingTo: Rcpp
-SystemRequirements: GNU make
 Packaged: 2010-09-09 18:42:28 UTC; jmc

Modified: pkg/Rcpp/inst/unitTests/testRcppModule/src/Makevars
===================================================================
--- pkg/Rcpp/inst/unitTests/testRcppModule/src/Makevars	2010-11-19 07:26:53 UTC (rev 2456)
+++ pkg/Rcpp/inst/unitTests/testRcppModule/src/Makevars	2010-11-19 07:32:38 UTC (rev 2457)
@@ -1,5 +1,5 @@
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" )
+PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"`
 
 ## As an alternative, one can also add this code in a file 'configure'
 ##