[Pomp-commits] r963 - pkg

[noreply at r-forge.r-project.org]

Author: kingaa
Date: 2014-05-24 03:19:36 +0200 (Sat, 24 May 2014)
New Revision: 963

Modified:
   pkg/Makefile
Log:
- small fixes

Modified: pkg/Makefile
===================================================================
--- pkg/Makefile	2014-05-23 16:23:12 UTC (rev 962)
+++ pkg/Makefile	2014-05-24 01:19:36 UTC (rev 963)
@@ -27,7 +27,7 @@
 pomp/inst/include/pomp.h: pomp/src/pomp.h
 	$(CP) $^ $@
 
-pompweb.vignettes: export POMP_BUILD_VIGNETTES=yes
+../www.vignettes: export POMP_BUILD_VIGNETTES=yes
 %.dist %.manual %.vignettes: export R_QPDF=qpdf
 %.dist %.manual %.vignettes: export R_GSCMD=gs
 %.dist %.manual %.vignettes: export GS_QUALITY=ebook
@@ -38,10 +38,10 @@
 %.vignettes %.data: export R_LIBS=$(CURDIR)/library
 %.bin %.check %.qcheck %.qqcheck %.xcheck %.crancheck %.upload %.publish %.clean %.install %.win: PKG = $*_$(shell perl -ne 'print $$1 if /Version:\s+(\d+\.\d+-\d+)/;' $*/DESCRIPTION)
 
-pompweb.vignettes: pomp.install pomp.manual
-	(cd pompweb/vignettes; make)
-	cp pomp.pdf pompweb/vignettes
-	$(RCMD) Rdconv -t html pomp/inst/NEWS.Rd -o pompweb/content/NEWS.html
+../www.vignettes: pomp.install pomp.manual
+	(cd ../www/vignettes; make)
+	cp pomp.pdf ../www/vignettes
+	$(RCMD) Rdconv -t html pomp/inst/NEWS.Rd -o ../www/content/NEWS.html
 
 %.vignettes: %.install
 	cd $*/vignettes; make 
@@ -73,27 +73,25 @@
 	$(TOUCH) $@
 
 %.xcheck: %.dist
+	mkdir -p check
 	$(RCMD) check --use-gct --use-valgrind --timings --library=check $(PKG).tar.gz
 	$(TOUCH) $@
 
 %.check: %.dist
+	mkdir -p check
 	$(RCMD) check --library=check $(PKG).tar.gz
 	$(TOUCH) $@
 
 %.qcheck: %.dist
+	mkdir -p check
 	$(RCMD) check --library=check --no-vignettes --no-tests $(PKG).tar.gz
 	$(TOUCH) $@
 
 %.qqcheck: %.dist
+	mkdir -p check
 	$(RCMD) check --library=check --no-codoc --no-examples --no-vignettes --no-manual --no-tests $(PKG).tar.gz
 	$(TOUCH) $@
 
-%.changelog:
-	$(SVN) update $*
-	$(SVN2CL) --include-rev --group-by-day -o $*/inst/ChangeLog $*
-	$(SVN) info $* | perl -ne "print if /Revision|Date/;" > $*/inst/SVN-REVISION
-	$(TOUCH) $@
-
 %.manual:
 	$(RM) $*.pdf
 	$(RCMD) Rd2pdf --no-preview --pdf $*