[Rcpp-commits] r1313 - in pkg/RcppGSL: . inst src

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

Author: romain
Date: 2010-05-25 11:14:58 +0200 (Tue, 25 May 2010)
New Revision: 1313

Added:
   pkg/RcppGSL/configure.win
Modified:
   pkg/RcppGSL/inst/ChangeLog
   pkg/RcppGSL/src/Makevars.win
Log:
windows care

Added: pkg/RcppGSL/configure.win
===================================================================
--- pkg/RcppGSL/configure.win	                        (rev 0)
+++ pkg/RcppGSL/configure.win	2010-05-25 09:14:58 UTC (rev 1313)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+

Modified: pkg/RcppGSL/inst/ChangeLog
===================================================================
--- pkg/RcppGSL/inst/ChangeLog	2010-05-25 09:07:56 UTC (rev 1312)
+++ pkg/RcppGSL/inst/ChangeLog	2010-05-25 09:14:58 UTC (rev 1313)
@@ -5,6 +5,11 @@
 	
 	* inst/include/RcppGSLForward.h : RcppGSL::matrix gets indexing 
 	operator(int,int)
+	
+	* configure.win: added empty configure.win so that R CMD check does not
+	get jealous about the configure script
+	
+	* src/Makevars.win: use Brian Ripley's suggestions to anticipate R 2.12.0
 
 2010-05-13  Dirk Eddelbuettel  <edd at debian.org>
 

Modified: pkg/RcppGSL/src/Makevars.win
===================================================================
--- pkg/RcppGSL/src/Makevars.win	2010-05-25 09:07:56 UTC (rev 1312)
+++ pkg/RcppGSL/src/Makevars.win	2010-05-25 09:14:58 UTC (rev 1313)
@@ -1,7 +1,4 @@
-
 ## This assumes that the LIB_GSL variable points to working GSL libraries
-## It also assume that we can call Rscript to ask Rcpp about its locations
 PKG_CPPFLAGS=-I$(LIB_GSL)/include -I../inst/include
-PKG_LIBS=-L$(LIB_GSL)/lib -lgsl -lgslcblas $(shell Rscript.exe -e "Rcpp:::LdFlags()")
+PKG_LIBS=-L$(LIB_GSL)/lib -lgsl -lgslcblas $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")
 
-