From a8a2a9d57f40ec7a4fc70df3dc470d88cd10c525 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Mon, 24 Jul 2017 16:31:07 +0200 Subject: Improve Makefile --- GNUmakefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 959c68f..7951422 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -24,7 +24,7 @@ clean: roxygen: @echo "Roxygenizing package..." - "$(R_HOME)/bin/Rscript" -e 'library(devtools); document()' + "$(R_HOME)/bin/Rscript" -e 'devtools::document()' @echo "DONE." pd: roxygen @@ -36,7 +36,7 @@ pd: roxygen $(TGZ): $(pkgfiles) sed -i -e "s/Date:.*/Date: $(DATE)/" DESCRIPTION @echo "Roxygenizing package..." - "$(R_HOME)/bin/Rscript" -e 'library(devtools); document()' + "$(R_HOME)/bin/Rscript" -e 'devtools::document()' @echo "Building package..." git log --no-merges -M --date=iso > ChangeLog "$(R_HOME)/bin/R" CMD build . > build.log 2>&1 @@ -53,7 +53,7 @@ winbin: $(WINBIN) test: build @echo "Running testthat tests..." - "$(R_HOME)/bin/Rscript" -e 'library(devtools); devtools::test()' 2>&1 | tee test.log + "$(R_HOME)/bin/Rscript" -e 'devtools::test()' 2>&1 | tee test.log @echo "DONE." quickcheck: build -- cgit v1.2.1