[Rcpp-commits] r1122 - in pkg/Rcpp: R src

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

Author: romain
Date: 2010-04-26 10:42:28 +0200 (Mon, 26 Apr 2010)
New Revision: 1122

Modified:
   pkg/Rcpp/R/RcppLdpath.R
   pkg/Rcpp/src/Makevars
Log:
use ifeq(,) instead of ifeq()

Modified: pkg/Rcpp/R/RcppLdpath.R
===================================================================
--- pkg/Rcpp/R/RcppLdpath.R	2010-04-26 07:59:45 UTC (rev 1121)
+++ pkg/Rcpp/R/RcppLdpath.R	2010-04-26 08:42:28 UTC (rev 1122)
@@ -1,7 +1,7 @@
 
 ## make sure system.file returns an absolute path
-system.file <- function(...) {
-    tools:::file_path_as_absolute( base:::system.file( ... ) )
+system_file <- function(...){
+	tools:::file_path_as_absolute( base:::system.file( ... ) )
 }
 
 ## identifies if the default linking on the platform should be static
@@ -15,9 +15,9 @@
 ## plus optinally an arch-specific directory on system building multi-arch
 RcppLdPath <- function() {
     if (nzchar(.Platform$r_arch)) {	## eg amd64, ia64, mips
-        path <- system.file("lib",.Platform$r_arch,package="Rcpp")
+        path <- system_file("lib",.Platform$r_arch,package="Rcpp")
     } else {
-        path <- system.file("lib",package="Rcpp")
+        path <- system_file("lib",package="Rcpp")
     }
     path
 }
@@ -52,7 +52,7 @@
 ## Provide compiler flags -- i.e. -I/path/to/Rcpp.h
 RcppCxxFlags <- function(cxx0x=FALSE) {
     # path <- RcppLdPath()
-    path <- system.file( "include", package = "Rcpp" )
+    path <- system_file( "include", package = "Rcpp" )
     #if (.Platform$OS.type=="windows") {
     #    path <- shQuote(path)
     #}

Modified: pkg/Rcpp/src/Makevars
===================================================================
--- pkg/Rcpp/src/Makevars	2010-04-26 07:59:45 UTC (rev 1121)
+++ pkg/Rcpp/src/Makevars	2010-04-26 08:42:28 UTC (rev 1122)
@@ -17,7 +17,7 @@
 CLINK_CPPFLAGS = $(shell Rscript "cxx0x/cxx0x.R")
 endif
 
-ifeq ($(DYLIB_EXT),)
+ifeq ($(SHLIB),)
 all:
 else
 all: 	$(SHLIB) userLibrary