[Earthmovdist-commits] r30 - pkg/src

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

Author: edd
Date: 2012-04-18 14:53:01 +0200 (Wed, 18 Apr 2012)
New Revision: 30

Modified:
   pkg/src/Makevars.win
Log:
overdue update to current variant reflecting 32/64 bit architecture


Modified: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	2010-10-14 18:52:05 UTC (rev 29)
+++ pkg/src/Makevars.win	2012-04-18 12:53:01 UTC (rev 30)
@@ -1,3 +1,3 @@
-# We need to know where libRcpp.so and Rcpp.h reside
-# 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 = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")