[Rcpp-commits] r2455 - in pkg/Rcpp: R inst/doc/Rcpp-package inst/skeleton

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

Author: romain
Date: 2010-11-19 08:21:06 +0100 (Fri, 19 Nov 2010)
New Revision: 2455

Modified:
   pkg/Rcpp/R/Rcpp.package.skeleton.R
   pkg/Rcpp/inst/doc/Rcpp-package/Rcpp-package.Rnw
   pkg/Rcpp/inst/skeleton/Makevars
Log:
adapt to use of backticks instead of shell

Modified: pkg/Rcpp/R/Rcpp.package.skeleton.R
===================================================================
--- pkg/Rcpp/R/Rcpp.package.skeleton.R	2010-11-18 21:32:10 UTC (rev 2454)
+++ pkg/Rcpp/R/Rcpp.package.skeleton.R	2010-11-19 07:21:06 UTC (rev 2455)
@@ -75,12 +75,11 @@
 		) 
 		x <- cbind( read.dcf( DESCRIPTION ), 
 			"Depends" = paste( depends, collapse = ", ") , 
-			"LinkingTo" = "Rcpp", 
-			"SystemRequirements" = "GNU make" )
+			"LinkingTo" = "Rcpp"
+		)
 		write.dcf( x, file = DESCRIPTION )
 		message( " >> added Depends: Rcpp" )
 		message( " >> added LinkingTo: Rcpp" )
-		message( " >> added SystemRequirements: GNU make" )
 	}
 	
 	# if there is a NAMESPACE, add a useDynLib

Modified: pkg/Rcpp/inst/doc/Rcpp-package/Rcpp-package.Rnw
===================================================================
--- pkg/Rcpp/inst/doc/Rcpp-package/Rcpp-package.Rnw	2010-11-18 21:32:10 UTC (rev 2454)
+++ pkg/Rcpp/inst/doc/Rcpp-package/Rcpp-package.Rnw	2010-11-19 07:21:06 UTC (rev 2455)
@@ -269,10 +269,6 @@
 indicates that the client package needs to use header files exposed by
 \pkg{Rcpp}.
 
-The \texttt{SystemRequirements} declaration indicates that the package depends
-on \proglang{GNU Make} which is needed when compiling the client package
-on platforms such as Solaris.
-
 \subsection{\texttt{Makevars} and \texttt{Makevars.win}}
 
 Unfortunately, the \texttt{LinkingTo} declaration in itself is not
@@ -302,10 +298,6 @@
 })
 @
 
-The use of \verb|$(shell)| to execute a sub-command is a \proglang{GNU Make}
-extension to the standard \proglang{Make} language which we have found to be
-more reliable than using backticks.
-
 \subsection{\texttt{NAMESPACE}}
 
 The \Sexpr{link("Rcpp.package.skeleton")} function also creates a file

Modified: pkg/Rcpp/inst/skeleton/Makevars
===================================================================
--- pkg/Rcpp/inst/skeleton/Makevars	2010-11-18 21:32:10 UTC (rev 2454)
+++ pkg/Rcpp/inst/skeleton/Makevars	2010-11-19 07:21:06 UTC (rev 2455)
@@ -1,5 +1,5 @@
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" )
+PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"`
 
 ## As an alternative, one can also add this code in a file 'configure'
 ##