From 19997986f7ee5b6274c9a06796b97a5610c4f888 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 26 Jun 2015 14:52:22 +0200 Subject: Pass R CMD check --as-cran, vignette rebuild --- GNUmakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 19658a85..df31abf5 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -34,7 +34,7 @@ all: build README.md: README.Rmd "$(RBIN)/Rscript" -e 'require(knitr); knit("README.Rmd")' -$(TGZ): $(pkgfiles) vignettes/*.html vignettes/*.pdf +$(TGZ): $(pkgfiles) quickinstall vignettes cd ..;\ "$(RBIN)/R" CMD build $(PKGSRC) 2>&1 | tee $(PKGNAME)/build.log @@ -82,7 +82,7 @@ vignettes/%.pdf: vignettes/header.tex vignettes/references.bib vignettes/%.Rnw vignettes/%.html: vignettes/mkin_vignettes.css vignettes/%.Rmd "$(RBIN)/Rscript" -e "tools::buildVignette(file = 'vignettes/$*.Rmd', dir = 'vignettes')" -vignettes: quickinstall vignettes/mkin.pdf vignettes/FOCUS_D.html vignettes/FOCUS_L.html vignettes/FOCUS_Z.pdf vignettes/compiled_models.html +vignettes: vignettes/mkin.pdf vignettes/FOCUS_D.html vignettes/FOCUS_L.html vignettes/FOCUS_Z.pdf vignettes/compiled_models.html sd: rm -rf $(SDDIR)/* -- cgit v1.2.1