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

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

Author: edd
Date: 2010-03-10 23:41:49 +0100 (Wed, 10 Mar 2010)
New Revision: 872

Modified:
   pkg/RcppExamples/inst/ChangeLog
   pkg/RcppExamples/src/Makevars.win
Log:
move back from backticks to $(shell ...) in Makevars.win


Modified: pkg/RcppExamples/inst/ChangeLog
===================================================================
--- pkg/RcppExamples/inst/ChangeLog	2010-03-10 22:21:39 UTC (rev 871)
+++ pkg/RcppExamples/inst/ChangeLog	2010-03-10 22:41:49 UTC (rev 872)
@@ -1,3 +1,8 @@
+2010-03-10  Dirk Eddelbuettel  <edd at debian.org>
+
+	* src/Makevars.win: Switch back from backticks to $(shell ...)
+	  which should be fine as GNU make is mandated on Windows anyway
+
 2010-03-07  Romain Francois <romain at r-enthusiasts.com
 
 	* src/RcppVectorExample.cpp: use a new vector for the output

Modified: pkg/RcppExamples/src/Makevars.win
===================================================================
--- pkg/RcppExamples/src/Makevars.win	2010-03-10 22:21:39 UTC (rev 871)
+++ pkg/RcppExamples/src/Makevars.win	2010-03-10 22:41:49 UTC (rev 872)
@@ -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 = `$(R_HOME)/bin/Rscript --vanilla -e 'Rcpp:::LdFlags()'`
+PKG_LIBS = $(shell $(R_HOME)/bin/Rscript --vanilla -e 'Rcpp:::LdFlags()'`
 PKG_CPPFLAGS = `$(R_HOME)/bin/Rscript --vanilla -e 'Rcpp:::CxxFlags()'`