X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Makefile;h=b18c3107a176a98b3bedf619db7ae03a430084d6;hb=acb5724f2575502cd587869d9e622dfa66a2c152;hp=5fec98bba7d6221f77d3a203bcc10a91a0756587;hpb=9802f3819fafc7db3e5efda91746774a537960ab;p=neurodebian.git

diff --git a/Makefile b/Makefile
index 5fec98b..b18c310 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,12 @@ pics:
 
 html: pics source
 	rsync -rvlhp sphinx/ build/src
+	cd artwork;	cp button_w200.png logo_tuned/fmri_w200.png ../build/src/_static; cd ..
+	cp 3rd/jquery.livetwitter/jquery.livetwitter.min.js build/src/_static
 	cd build/src && $(MAKE) html BUILDDIR=$(CURDIR)/build 2>&1
 	mv $(WWW_DIR)/_static/robots.txt $(WWW_DIR)/
+	cp -r build/src/lists $(WWW_DIR)/
+	cp -r sphinx/survey/2011/figures/* $(WWW_DIR)/_images/
 
 
 clean:
@@ -31,6 +35,7 @@ source-stamp: build/db.db
 		--db build/db.db \
 		--outdir build/src \
 		--pkgaddenum pkgs \
+		--extracts /home/www/neuro.debian.net/www/debian/extracts \
 		commandisirrelevant
 	rm -f html-stamp
 	touch $@
@@ -40,7 +45,7 @@ removecache:
 	-rm -rf build/cache
 
 removedb:
-	-rm build/db.db
+	-rm -f build/db.db
 
 
 updatedb: removedb removecache build/db.db
@@ -52,11 +57,13 @@ build/db.db:
 		--cfg neurodebian.cfg \
 		--db build/db.db \
 		updatedb
-	-rm source-stamp
+	-rm -f source-stamp
 
 
 upload-website: html
-	rsync -rvzlhp --delete --exclude=debian --exclude=debian-local --chmod=Dg+s,g+rw $(WWW_DIR) $(WWW_UPLOAD_URI)
+	rsync -rvzlhp --delete \
+        --exclude=debian --exclude=debian-local --exclude=_files \
+        --chmod=Dg+s,g+rw $(WWW_DIR) $(WWW_UPLOAD_URI)
 
 .PHONY: removedb removecache updatedb upload-website clean distclean pics html