[Rcpp-commits] r651 - in pkg/inst: . skeleton

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

Author: edd
Date: 2010-02-09 18:31:29 +0100 (Tue, 09 Feb 2010)
New Revision: 651

Modified:
   pkg/inst/ChangeLog
   pkg/inst/skeleton/Makevars
   pkg/inst/skeleton/Makevars.win
Log:
small improvement to inst/skeleton/Makevars*


Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2010-02-09 13:13:33 UTC (rev 650)
+++ pkg/inst/ChangeLog	2010-02-09 17:31:29 UTC (rev 651)
@@ -1,10 +1,15 @@
+2010-02-09  Dirk Eddelbuettel  <edd at debian.org>
+
+	* inst/skeleton/Makevars: Use $R_HOME/bin indirection
+	* inst/skeleton/Makevars.win: Idem
+
 2010-02-09  Romain Francois <romain at r-enthusiasts.com>
 
 	* src/Rcpp/CharacterVector.h: CharacterVector gains a random
-	access iterator, begin() and end() to support STL algorithms. 
+	access iterator, begin() and end() to support STL algorithms.
 	The iterator dereferences to a StringProxy
 
-	* src/Rcpp/RObject.h: remove RObject::asFoo methods which were 
+	* src/Rcpp/RObject.h: remove RObject::asFoo methods which were
 	deprecated in Rcpp 0.7.5. The alternative is to use Rcpp::as<Foo>
 
 2010-02-08  Dirk Eddelbuettel  <edd at debian.org>

Modified: pkg/inst/skeleton/Makevars
===================================================================
--- pkg/inst/skeleton/Makevars	2010-02-09 13:13:33 UTC (rev 650)
+++ pkg/inst/skeleton/Makevars	2010-02-09 17:31:29 UTC (rev 651)
@@ -1,4 +1,6 @@
-PKG_CPPFLAGS=$(shell Rscript -e "Rcpp:::CxxFlags()" )
-PKG_LIBS = $(shell Rscript -e "Rcpp:::LdFlags()" )
-CLINK_CPPFLAGS=$(shell Rscript -e "Rcpp:::Cxx0xFlags()" )
+## Use the R_HOME indirection to support installations of multiple R version
+PKG_CPPFLAGS=$(shell $(R_HOME)/bin/Rscript -e "Rcpp:::CxxFlags()" )
+PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" )
+## Uncomment this if you want to use C++0x features -- which are not currently portable
+## CLINK_CPPFLAGS=$(shell Rscript -e "Rcpp:::Cxx0xFlags()" )
 

Modified: pkg/inst/skeleton/Makevars.win
===================================================================
--- pkg/inst/skeleton/Makevars.win	2010-02-09 13:13:33 UTC (rev 650)
+++ pkg/inst/skeleton/Makevars.win	2010-02-09 17:31:29 UTC (rev 651)
@@ -1,4 +1,5 @@
 
 ## This assume that we can call Rscript to ask Rcpp about its locations
-PKG_CPPFLAGS=$(shell Rscript.exe -e "Rcpp:::CxxFlags()")
-PKG_LIBS=$(shell Rscript.exe -e "Rcpp:::LdFlags()")
+## Use the R_HOME indirection to support installations of multiple R version
+PKG_LIBS = `$(R_HOME)/bin/Rscript -e 'Rcpp:::LdFlags()'`
+PKG_CPPFLAGS = `$(R_HOME)/bin/Rscript -e 'Rcpp:::CxxFlags()'`