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

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

Author: edd
Date: 2010-10-29 21:57:12 +0200 (Fri, 29 Oct 2010)
New Revision: 2370

Modified:
   pkg/RcppGSL/DESCRIPTION
   pkg/RcppGSL/inst/doc/Makefile
Log:
small tweaks to Makefile for docs similar to what Rcpp now has
DESCRIPTION now Suggests: RUnit to make R CMD check happy


Modified: pkg/RcppGSL/DESCRIPTION
===================================================================
--- pkg/RcppGSL/DESCRIPTION	2010-10-29 01:20:08 UTC (rev 2369)
+++ pkg/RcppGSL/DESCRIPTION	2010-10-29 19:57:12 UTC (rev 2370)
@@ -9,5 +9,6 @@
 License: GPL (>=2)
 LazyLoad: yes
 Depends: Rcpp (>= 0.8.0)
+Suggests: RUnit
 LinkingTo: Rcpp
 SystemRequirements: GNU GSL, GNU make

Modified: pkg/RcppGSL/inst/doc/Makefile
===================================================================
--- pkg/RcppGSL/inst/doc/Makefile	2010-10-29 01:20:08 UTC (rev 2369)
+++ pkg/RcppGSL/inst/doc/Makefile	2010-10-29 19:57:12 UTC (rev 2370)
@@ -1,24 +1,32 @@
 
+## There is an old bug in texidvi that makes it not swallow the ~
+## marker used to denote whitespace. This is actually due to fixing
+## another bug they whereby you could not run texidvi on directory
+## names containing a tilde (as we happen to do for Debian builds of R
+## alpha/beta/rc releases). The 'tilde' bug will go away as it
+## reportedly has been squashed upstream but I am still bitten by it
+## on Ubuntu so for Dirk will insist on pdflatex and this variable helps
+whoami=$(shell whoami)
+
 all: clean RcppGSL.pdf
 
 clean:
-	touch RcppGSL.pdf
-	rm RcppGSL.pdf
+        # rm RcppGSL.pdf
 
 RcppGSL.pdf: RcppGSL/RcppGSL.Rnw
-	rm RcppGSL.Rnw 
 	cp -f RcppGSL/RcppGSL.Rnw .
 	Rscript -e "require(highlight); driver <- HighlightWeaveLatex(boxes = TRUE, bg = 'white' ); Sweave( 'RcppGSL.Rnw', driver = driver ); "
+ifneq (,$(findstring edd,$(whoami)))
+	pdflatex RcppGSL
+else
 	Rscript -e "tools::texi2dvi( 'RcppGSL.tex', pdf = TRUE, clean = FALSE )"
+endif
 	bibtex RcppGSL
+ifneq (,$(findstring edd,$(whoami)))
+	pdflatex RcppGSL
+else
 	Rscript -e "tools::texi2dvi( 'RcppGSL.tex', pdf = TRUE, clean = TRUE )"
-	# rm -fr RcppGSL.tex
-	rm -fr RcppGSL.bbl
-	rm -fr RcppGSL.blg
-	rm -fr RcppGSL.aux
-	rm -fr RcppGSL.out
-	rm -fr RcppGSL.log
-	rm RcppGSL.Rnw
+endif
+        # rm -fr RcppGSL.tex
+	rm -fr RcppGSL.bbl RcppGSL.blg RcppGSL.aux RcppGSL.out RcppGSL.log rm RcppGSL.Rnw
 	cp RcppGSL/RcppGSL-fake.Rnw RcppGSL.Rnw
-	
-