[Pgfsweave-commits] r14 - in pkg: . src

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

Author: cameronbracken
Date: 2010-04-07 02:31:51 +0200 (Wed, 07 Apr 2010)
New Revision: 14

Modified:
   pkg/DESCRIPTION
   pkg/src/Makevars
Log:
Merge branch 'master' into r-forge-local

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2010-04-04 21:04:43 UTC (rev 13)
+++ pkg/DESCRIPTION	2010-04-07 00:31:51 UTC (rev 14)
@@ -7,7 +7,8 @@
 Maintainer: Cameron Bracken <cameron.bracken at gmail.com> 
 Depends: stashR, filehash, tikzDevice, cacheSweave, getopt
 Imports: digest, tools, utils
-SystemRequirement: pgf (>=2.00) (http://sourceforge.net/projects/pgf/) for the vignette and for externalization.
+SystemRequirement: pgf (>=2.00) (http://sourceforge.net/projects/pgf/) for the 
+      vignette and for externalization. GNU make.
 Description:  The pgfSweave package provides capabilities for 'caching' 
       graphics generated with Sweave.  Using pgfSweave, figure labels are 
       converted to LaTeX strings so not only do they match the style of the 

Modified: pkg/src/Makevars
===================================================================
--- pkg/src/Makevars	2010-04-04 21:04:43 UTC (rev 13)
+++ pkg/src/Makevars	2010-04-07 00:31:51 UTC (rev 14)
@@ -3,4 +3,8 @@
 all : cmdScript  $(SHLIB)
 
 cmdScript :
+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