Fixes for R_HOME warning on CRAN

exec/install-script.R

@@ -1,6 +1,8 @@
 #!/usr/bin/env Rscript
 
 options(warn=-1)
+R_HOME <- Sys.getenv('R_HOME')
+R_HOME <- ifelse(length(R_HOME) == 0, R.home(), R_HOME)
 bindir <- paste(R.home(),"/bin",sep='')
 bin_script <- file.path(bindir,'pgfsweave')
 x <- file.remove(bin_script)
@@ -46,7 +48,7 @@ if(success){
 
 	cat('\n***********************\n')
 	cat('Failed to install custom pgfsweave script:\n')
-	cat('  Thats ok! You can manually install it wherever you want!\n')
+	cat('  Thats ok! You can manually install it later!\n')
 	cat('***********************\n')
 
 }

man/pgfSweave.Rd

@@ -77,6 +77,7 @@ pgf manual externalization section: \url{http://sourceforge.net/projects/pgf/}
 \examples{
 \dontrun{vignette("pgfSweave")}
 
+\dontrun{
 library(pgfSweave)
 oldcwd <- getwd()
 dir <- tempdir()
@@ -85,6 +86,7 @@ file.copy(system.file("example","pgfSweave-example.Rnw", package = "pgfSweave"),
 file <- file.path(dir,"pgfSweave-example.Rnw")
 pgfSweave(file,compile.tex=FALSE)
 setwd(oldcwd)
+}
 
 \dontrun{
 ## Normally to compile to PDF by  

src/Makevars

@@ -3,4 +3,8 @@
 all : cmdScript  $(SHLIB)
 
 cmdScript :
-	Rscript ../exec/install-script.R
+ifdef R_HOME
+	${R_HOME}/bin/Rscript ../exec/install-script.R
+else
+	(R_HOME=`R RHOME`; ${R_HOME}/bin/Rscript ../exec/install-script.R)
+endif

src/dummy.c

@@ -1,5 +1,8 @@
 
-//Dummy file to avoid check warning about no source code
+/*
+Dummy file to avoid check warning about no source code
+since all we are using is Makevars
+*/
 void dummy(){
 	return;
 }