diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2015-10-08 07:50:36 +0200 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2015-10-08 08:03:18 +0200 |
commit | 17ef63f22008c80998cb2690a40ad1238d06a400 (patch) | |
tree | e38e1c60ace4e19f62325a674be2d5aa13fe767b /GNUmakefile | |
parent | e15abefa041e12dc36cce1d827f51e6ce192cefb (diff) |
Fix NAMESPACE, update static docs, simplify Makefilev0.1-37
Diffstat (limited to 'GNUmakefile')
-rw-r--r-- | GNUmakefile | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/GNUmakefile b/GNUmakefile index c0d78e3..140f7e3 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,7 +1,7 @@ PKGNAME := $(shell sed -n "s/Package: *\([^ ]*\)/\1/p" DESCRIPTION) PKGVERS := $(shell sed -n "s/Version: *\([^ ]*\)/\1/p" DESCRIPTION) PKGSRC := $(shell basename $(PWD)) -TGZ := ../$(PKGNAME)_$(PKGVERS).tar.gz +TGZ := $(PKGNAME)_$(PKGVERS).tar.gz # Specify the directory holding R binaries. To use an alternate R build (say a # pre-prelease version) use `make RBIN=/path/to/other/R/` or `export RBIN=...` @@ -19,10 +19,11 @@ help: @echo "-----------------" @echo " build Create the package" @echo " build-no-vignettes Create the package without rebuilding vignettes" - @echo " check Invoke build and then check the package" - @echo " check-no-vignettes Invoke build without rebuilding vignettes, and then check" @echo " install Invoke build and then install the result" @echo " install-no-vignettes Invoke build without rebuilding vignettes and then install the result" + @echo " check Invoke build and then check the package" + @echo " check-no-vignettes Invoke build without rebuilding vignettes, and then check" + @echo " sd Build static documentation" @echo " winbuilder Upload the build to winbuilder" @echo "" @echo "Using R in: $(RBIN)" @@ -35,28 +36,22 @@ help: #------------------------------------------------------------------------------ build: - cd ..;\ - "$(RBIN)/R" CMD build $(PKGSRC) + "$(RBIN)/R" CMD build . build-no-vignettes: - cd ..;\ - "$(RBIN)/R" CMD build $(PKGSRC) --no-build-vignettes + "$(RBIN)/R" CMD build --no-build-vignettes . install: build - cd ..;\ - "$(RBIN)/R" CMD INSTALL $(TGZ) + "$(RBIN)/R" CMD INSTALL $(TGZ) install-no-vignettes: build-no-vignettes - cd ..;\ - "$(RBIN)/R" CMD INSTALL $(TGZ) + "$(RBIN)/R" CMD INSTALL $(TGZ) check: build - cd ..;\ - "$(RBIN)/R" CMD check --as-cran $(TGZ) + "$(RBIN)/R" CMD check --as-cran $(TGZ) check-no-vignettes: build-no-vignettes - cd ..;\ - "$(RBIN)/R" CMD check --as-cran $(TGZ) + "$(RBIN)/R" CMD check --as-cran $(TGZ) sd: @echo Now execute |