From 71d43b104999d7aee96d35ff2a9006f739d2df60 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Tue, 1 Jul 2014 23:23:52 +0200 Subject: Support formation fractions without sink pathway, updates --- GNUmakefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 969b4ff0..693ec892 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -26,7 +26,7 @@ pkgfiles = NEWS \ TODO \ vignettes/* -all: NEWS check +all: NEWS check clean # convert markdown to R's NEWS format (from knitr package) NEWS: NEWS.md @@ -57,7 +57,12 @@ check: build "$(RBIN)/R" CMD check --as-cran --no-tests --no-build-vignettes $(TGZ) check-no-vignettes: build-no-vignettes - "$(RBIN)/R" CMD check --as-cran --no-tests $(TGZVNR) + mv $(TGZVNR) $(TGZ) + "$(RBIN)/R" CMD check --as-cran --no-tests $(TGZ) + mv $(TGZ) $(TGZVNR) + +clean: + $(RM) -r $(PKGNAME).Rcheck/ test: install-no-vignettes cd tests;\ @@ -74,9 +79,6 @@ move-sd: rm -rf $(SDDIR)/*;\ cp -r inst/web/* $(SDDIR) -#------------------------------------------------------------------------------ -# Packaging Tasks -#------------------------------------------------------------------------------ winbuilder: build date @echo "Uploading to R-release on win-builder" -- cgit v1.2.1