[Rcpp-commits] r2622 - in pkg/RcppGSL: R inst/skeleton

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

Author: romain
Date: 2010-11-30 15:24:51 +0100 (Tue, 30 Nov 2010)
New Revision: 2622

Modified:
   pkg/RcppGSL/R/inline.R
   pkg/RcppGSL/inst/skeleton/configure.win
Log:
update

Modified: pkg/RcppGSL/R/inline.R
===================================================================
--- pkg/RcppGSL/R/inline.R	2010-11-30 14:21:36 UTC (rev 2621)
+++ pkg/RcppGSL/R/inline.R	2010-11-30 14:24:51 UTC (rev 2622)
@@ -84,7 +84,7 @@
     plugin <- Rcpp:::Rcpp.plugin.maker(
         include.before = "#include <RcppGSL.h>",
         libs = sprintf( "%s $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)", LdFlags(FALSE) ),
-        package = "RcppGSL", Makevars = NULL
+        package = "RcppGSL", Makevars = NULL, Makevars.win = NULL
     )
     settings <- plugin()
     settings$env$PKG_CPPFLAGS <- CFlags(FALSE)

Modified: pkg/RcppGSL/inst/skeleton/configure.win
===================================================================
--- pkg/RcppGSL/inst/skeleton/configure.win	2010-11-30 14:21:36 UTC (rev 2621)
+++ pkg/RcppGSL/inst/skeleton/configure.win	2010-11-30 14:24:51 UTC (rev 2622)
@@ -4,5 +4,5 @@
 
 sed -e "s|@GSL_LIBS@|${GSL_LIBS}|" src/Makevars.in |
     sed -e "s|@GSL_CFLAGS@|${GSL_CFLAGS}|" |
-    sed -e "s|@RCPP_LDFLAGS@|${RCPP_LDFLAGS}|" > src/Makevars
+    sed -e "s|@RCPP_LDFLAGS@|${RCPP_LDFLAGS}|" > src/Makevars.win