[Rcpp-commits] r1310 - in pkg/RcppExamples: inst src

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

Author: romain
Date: 2010-05-25 09:58:36 +0200 (Tue, 25 May 2010)
New Revision: 1310

Modified:
   pkg/RcppExamples/inst/ChangeLog
   pkg/RcppExamples/src/Makevars.win
Log:
making sure the correct library is found by following Brian Ripley's advices 

Modified: pkg/RcppExamples/inst/ChangeLog
===================================================================
--- pkg/RcppExamples/inst/ChangeLog	2010-05-25 07:54:33 UTC (rev 1309)
+++ pkg/RcppExamples/inst/ChangeLog	2010-05-25 07:58:36 UTC (rev 1310)
@@ -2,6 +2,9 @@
 
 	* src/*.cpp: use BEGIN_RCPP/END_RCPP in new api examples and use List::create
 	instead of Pairlist
+	
+	* src/Makevars.win: apply Brian Ripley's advices from R-devel thread to
+	anticipate changes in R 2.12.0
 
 2010-03-10  Dirk Eddelbuettel  <edd at debian.org>
 

Modified: pkg/RcppExamples/src/Makevars.win
===================================================================
--- pkg/RcppExamples/src/Makevars.win	2010-05-25 07:54:33 UTC (rev 1309)
+++ pkg/RcppExamples/src/Makevars.win	2010-05-25 07:58:36 UTC (rev 1310)
@@ -1,5 +1,5 @@
 
 ## This assume that we can call Rscript to ask Rcpp about its locations
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()")
+PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")