[Rcpp-commits] r2918 - in pkg/RcppGSL: . inst inst/doc

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

Author: edd
Date: 2011-02-28 23:36:26 +0100 (Mon, 28 Feb 2011)
New Revision: 2918

Modified:
   pkg/RcppGSL/ChangeLog
   pkg/RcppGSL/inst/NEWS
   pkg/RcppGSL/inst/doc/Makefile
Log:
inst/doc/Makefile now respects $R_HOME


Modified: pkg/RcppGSL/ChangeLog
===================================================================
--- pkg/RcppGSL/ChangeLog	2011-02-28 22:34:40 UTC (rev 2917)
+++ pkg/RcppGSL/ChangeLog	2011-02-28 22:36:26 UTC (rev 2918)
@@ -1,3 +1,7 @@
+2011-02-28  Dirk Eddelbuettel  <edd at debian.org>
+
+	* inst/doc/Makefile: Call R and Rscript relative to R_HOME/bin
+
 2011-02-11  Dirk Eddelbuettel  <edd at debian.org>
 
 	* inst/doc/RcppGSL/Makefile: Also create unitTest vignette

Modified: pkg/RcppGSL/inst/NEWS
===================================================================
--- pkg/RcppGSL/inst/NEWS	2011-02-28 22:34:40 UTC (rev 2917)
+++ pkg/RcppGSL/inst/NEWS	2011-02-28 22:36:26 UTC (rev 2918)
@@ -1,3 +1,7 @@
+0.1.1   2011-xx-yy
+
+    o   inst/doc/Makefile now respects $R_HOME environment variable
+
 0.1.0   2010-11-30
 
     o   Initial CRAN release with basic functionality for vectors and matrices

Modified: pkg/RcppGSL/inst/doc/Makefile
===================================================================
--- pkg/RcppGSL/inst/doc/Makefile	2011-02-28 22:34:40 UTC (rev 2917)
+++ pkg/RcppGSL/inst/doc/Makefile	2011-02-28 22:36:26 UTC (rev 2918)
@@ -14,28 +14,34 @@
 	rm -f RcppGSL.Rnw 
 	cp RcppGSL/RcppGSL-fake.Rnw RcppGSL.Rnw
 
+setvars:
+ifeq (${R_HOME},)
+R_HOME=	$(shell R RHOME)
+endif
+RPROG=	$(R_HOME)/bin/R
+RSCRIPT=$(R_HOME)/bin/Rscript
 
 RcppGSL-unitTests.pdf:
 	rm -fr unitTests-results/*
-	Rscript --vanilla unitTests/RcppGSL-unitTests.R
-	R CMD Sweave RcppGSL-unitTests.Rnw
-	Rscript --vanilla -e "tools::texi2dvi( 'RcppGSL-unitTests.tex', pdf = TRUE, clean = TRUE )"
+	$(RSCRIPT) --vanilla unitTests/RcppGSL-unitTests.R
+	$(RPROG) CMD Sweave RcppGSL-unitTests.Rnw
+	$(RSCRIPT) --vanilla -e "tools::texi2dvi( 'RcppGSL-unitTests.tex', pdf = TRUE, clean = TRUE )"
 	rm -fr RcppGSL-unitTests.tex
 
 RcppGSL.pdf: RcppGSL/RcppGSL.Rnw
 	cp -f RcppGSL/RcppGSL.Rnw .
-	Rscript --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE); Sweave( 'RcppGSL.Rnw', driver = driver ); "
+	$(RSCRIPT) --vanilla -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE); Sweave( 'RcppGSL.Rnw', driver = driver ); "
 ifneq (,$(findstring edd,$(whoami)))
 	pdflatex RcppGSL
 else
-	Rscript -e "tools::texi2dvi( 'RcppGSL.tex', pdf = TRUE, clean = FALSE )"
+	$(RSCRIPT) -e "tools::texi2dvi( 'RcppGSL.tex', pdf = TRUE, clean = FALSE )"
 endif
 	bibtex RcppGSL
 ifneq (,$(findstring edd,$(whoami)))
 	pdflatex RcppGSL
 	pdflatex RcppGSL
 else
-	Rscript -e "tools::texi2dvi( 'RcppGSL.tex', pdf = TRUE, clean = TRUE )"
+	$(RSCRIPT) -e "tools::texi2dvi( 'RcppGSL.tex', pdf = TRUE, clean = TRUE )"
 endif
 	rm -fr RcppGSL.tex RcppGSL.bbl RcppGSL.blg RcppGSL.aux RcppGSL.out RcppGSL.log 
 	cp RcppGSL/RcppGSL-fake.Rnw RcppGSL.Rnw