[Rprotobuf-commits] r415 - in pkg: . inst/doc

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

Author: edd
Date: 2011-04-06 04:06:49 +0200 (Wed, 06 Apr 2011)
New Revision: 415

Modified:
   pkg/ChangeLog
   pkg/inst/doc/Makefile
Log:
The 'trying our hardest to make BDR happy' commit


Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog	2011-04-04 19:58:36 UTC (rev 414)
+++ pkg/ChangeLog	2011-04-06 02:06:49 UTC (rev 415)
@@ -1,3 +1,7 @@
+2011-04-05  Dirk Eddelbuettel  <edd at debian.org>
+
+	* inst/doc/Makefile: Call R and Rscript relative to R_HOME/bin
+
 2011-04-04  Dirk Eddelbuettel  <edd at debian.org>
 
 	* inst/doc/Makefile: Do not call clean in all target

Modified: pkg/inst/doc/Makefile
===================================================================
--- pkg/inst/doc/Makefile	2011-04-04 19:58:36 UTC (rev 414)
+++ pkg/inst/doc/Makefile	2011-04-06 02:06:49 UTC (rev 415)
@@ -4,14 +4,21 @@
 clean:
 	rm -fr *.pdf
 
+setvars:
+ifeq (${R_HOME},)
+R_HOME=	$(shell R RHOME)
+endif
+RPROG=	$(R_HOME)/bin/R
+RSCRIPT=$(R_HOME)/bin/Rscript
+
 RProtoBuf-unitTests.pdf: unitTests/RProtoBuf-unitTests.R
-	Rscript --default-packages="RProtoBuf,Rcpp,brew,RUnit,tools,utils" unitTests/RProtoBuf-unitTests.R
+	$(RSCRIPT) --default-packages="RProtoBuf,Rcpp,brew,RUnit,tools,utils" unitTests/RProtoBuf-unitTests.R
 
 RProtoBuf.pdf: RProtoBuf/RProtoBuf.Rnw
 	touch RProtoBuf.Rnw
 	rm RProtoBuf.Rnw
 	cp RProtoBuf/RProtoBuf.Rnw RProtoBuf.Rnw
-	Rscript -e "require( 'highlight' ); require('tools'); Sweave('RProtoBuf.Rnw', driver = HighlightWeaveLatex() ) ; texi2dvi('RProtoBuf.tex', pdf = TRUE, clean = TRUE)"
+	$(RSCRIPT) -e "require( 'highlight' ); require('tools'); Sweave('RProtoBuf.Rnw', driver = HighlightWeaveLatex() ) ; texi2dvi('RProtoBuf.tex', pdf = TRUE, clean = TRUE)"
 	rm -fr RProtoBuf.tex
 	rm -fr RProtoBuf.Rnw
 	rm -fr RProtoBuf.aux
@@ -23,7 +30,7 @@
 	touch RProtoBuf-quickref.Rnw
 	rm RProtoBuf-quickref.Rnw
 	cp RProtoBuf-quickref/RProtoBuf-quickref.Rnw .
-	Rscript -e "require( 'highlight' ); require('tools'); Sweave('RProtoBuf-quickref.Rnw', driver = HighlightWeaveLatex() ) ; texi2dvi('RProtoBuf-quickref.tex', pdf = TRUE, clean = TRUE)"
+	$(RSCRIPT) -e "require( 'highlight' ); require('tools'); Sweave('RProtoBuf-quickref.Rnw', driver = HighlightWeaveLatex() ) ; texi2dvi('RProtoBuf-quickref.tex', pdf = TRUE, clean = TRUE)"
 	rm -fr RProtoBuf-quickref.tex
 	rm -fr RProtoBuf-quickref.Rnw
 	rm -fr RProtoBuf-quickref.aux