From 382f5fe8432ab0d7e9664116ae6f4be3283e4ede Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 27 Jun 2014 17:04:15 +0200 Subject: Simplify and correct targets using $(TGZ) and $(TGZVNR) --- GNUmakefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 687af76e..cbcb241a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -75,20 +75,17 @@ build: $(TGZ) build-no-vignettes: $(TGZVNR) install: build - cd ..;\ - "$(RBIN)/R" CMD INSTALL $(PKGNAME)_$(PKGVERS).tar.gz + "$(RBIN)/R" CMD INSTALL $(TGZ) install-no-vignettes: build-no-vignettes - cd ..;\ - "$(RBIN)/R" CMD INSTALL $(PKGNAME)_$(PKGVERS).tar.gz + "$(RBIN)/R" CMD INSTALL $(TGZVNR) check: build - cd ..;\ - "$(RBIN)/R" CMD check --as-cran --no-tests $(PKGNAME)_$(PKGVERS).tar.gz + # Vignettes have been rebuilt by the build target so do not repeat that here + "$(RBIN)/R" CMD check --as-cran --no-tests --no-build-vignettes $(TGZ) check-no-vignettes: build-no-vignettes - cd ..;\ - "$(RBIN)/R" CMD check --as-cran --no-tests $(PKGNAME)_$(PKGVERS).tar.gz + "$(RBIN)/R" CMD check --as-cran --no-tests $(TGZVNR) test: install-no-vignettes cd tests;\ @@ -125,4 +122,4 @@ r-forge: submit: @echo "\nAre you sure you want to release to CRAN?" - @echo "\nThen open the form at http://cran.r-project.org/submit.html" + @echo "\nThen use the form at http://cran.r-project.org/submit.html" -- cgit v1.2.1