[Pgfsweave-commits] r9 - in pkg: exec man src

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

Author: cameronbracken
Date: 2009-11-28 20:51:06 +0100 (Sat, 28 Nov 2009)
New Revision: 9

Modified:
   pkg/exec/install-script.R
   pkg/man/pgfSweave.Rd
   pkg/src/Makevars
   pkg/src/dummy.c
Log:
Merge branch 'master' into r-forge-local

Modified: pkg/exec/install-script.R
===================================================================
--- pkg/exec/install-script.R	2009-11-19 17:15:46 UTC (rev 8)
+++ pkg/exec/install-script.R	2009-11-28 19:51:06 UTC (rev 9)
@@ -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 @@
 	
 	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')
 	
 }

Modified: pkg/man/pgfSweave.Rd
===================================================================
--- pkg/man/pgfSweave.Rd	2009-11-19 17:15:46 UTC (rev 8)
+++ pkg/man/pgfSweave.Rd	2009-11-28 19:51:06 UTC (rev 9)
@@ -77,6 +77,7 @@
 \examples{
 \dontrun{vignette("pgfSweave")}
 
+\dontrun{
 library(pgfSweave)
 oldcwd <- getwd()
 dir <- tempdir()
@@ -85,6 +86,7 @@
 file <- file.path(dir,"pgfSweave-example.Rnw")
 pgfSweave(file,compile.tex=FALSE)
 setwd(oldcwd)
+}
 
 \dontrun{
 ## Normally to compile to PDF by  

Modified: pkg/src/Makevars
===================================================================
--- pkg/src/Makevars	2009-11-19 17:15:46 UTC (rev 8)
+++ pkg/src/Makevars	2009-11-28 19:51:06 UTC (rev 9)
@@ -3,4 +3,8 @@
 all : cmdScript  $(SHLIB)
 
 cmdScript :
-	R_HOME=`R RHOME`; ${R_HOME}/bin/Rscript ../exec/install-script.R
\ No newline at end of file
+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
\ No newline at end of file

Modified: pkg/src/dummy.c
===================================================================
--- pkg/src/dummy.c	2009-11-19 17:15:46 UTC (rev 8)
+++ pkg/src/dummy.c	2009-11-28 19:51:06 UTC (rev 9)
@@ -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;
 }