[Rcpp-commits] r2461 - in pkg/RcppCImg: . src

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

Author: romain
Date: 2010-11-19 08:35:23 +0100 (Fri, 19 Nov 2010)
New Revision: 2461

Modified:
   pkg/RcppCImg/DESCRIPTION
   pkg/RcppCImg/src/Makevars
Log:
new PKG_LIBS scheme

Modified: pkg/RcppCImg/DESCRIPTION
===================================================================
--- pkg/RcppCImg/DESCRIPTION	2010-11-19 07:34:48 UTC (rev 2460)
+++ pkg/RcppCImg/DESCRIPTION	2010-11-19 07:35:23 UTC (rev 2461)
@@ -11,4 +11,4 @@
 LazyLoad: yes
 Depends: Rcpp (>= 0.8.8.1)
 LinkingTo: Rcpp
-SystemRequirements: GNU make
+

Modified: pkg/RcppCImg/src/Makevars
===================================================================
--- pkg/RcppCImg/src/Makevars	2010-11-19 07:34:48 UTC (rev 2460)
+++ pkg/RcppCImg/src/Makevars	2010-11-19 07:35:23 UTC (rev 2461)
@@ -1,3 +1,3 @@
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" ) -lm -lpthread -L/usr/X11R6/lib -lX11
+PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"` -lm -lpthread -L/usr/X11R6/lib -lX11
 PKG_CPPFLAGS += -I../inst/include/