From 3d4f253ab14bb268cc5c3b80c4aacfeb72cab3e8 Mon Sep 17 00:00:00 2001
From: jranke <jranke@edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
Date: Thu, 2 Jul 2015 11:58:43 +0000
Subject: Adapt to R CMD check --as-cran on R-devel, improve Makefile

git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/kinfit@264 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
---
 GNUmakefile | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

(limited to 'GNUmakefile')

diff --git a/GNUmakefile b/GNUmakefile
index 833d2fc..8ab7153 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -18,17 +18,17 @@ SDDIR ?= $(RFSVN)/www/kinfit_static
 .PHONY: help
 
 pkgfiles = data/* \
-	   DESCRIPTION \
-	   inst/staticdocs/README \
-	   man/* \
-	   NAMESPACE \
-	   R/* \
-	   tests \
-           vignettes/header.tex \
-           vignettes/examples.Rnw \
-           vignettes/kinfit.Rnw \
-           vignettes/KinGUI/* \
-	   vignettes/references.bib
+	DESCRIPTION \
+	inst/staticdocs/README \
+	man/* \
+	NAMESPACE \
+	R/* \
+	tests \
+	vignettes/header.tex \
+	vignettes/examples.Rnw \
+	vignettes/kinfit.Rnw \
+	vignettes/KinGUI/* \
+	vignettes/references.bib
 
 all: check clean
 
@@ -70,11 +70,7 @@ vignettes/examples.pdf: vignettes/examples.Rnw
 vignettes: vignettes/examples.pdf vignettes/kinfit.pdf
 
 sd:
-	"$(RBIN)/Rscript" -e "library(staticdocs); build_site()"
-
-move-sd: sd
-	rm -f $(SDDIR)/{*.html,css/*.css,img/*.png,js/*.js,vignettes/*.pdf,vignettes/*.html};\
-	cp -r inst/web/* $(SDDIR); cd $(SDDIR) && svn add --force .
+	"$(RBIN)/Rscript" -e "library(staticdocs); build_site(site_path = '$(SDDIR)')"
 
 clean: 
 	$(RM) -r $(PKGNAME).Rcheck/
-- 
cgit v1.2.1