X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Makefile;h=4b9e35a7c432e465bdc0be57ec29b89b60395f49;hb=9f24058ac00778124323752e4c1652175366232e;hp=3e2ceafff8530799add6ebbbfd04fcd25276b1d0;hpb=cdda5b6ece0e7b41b2d1a834ee7f8a0e5889ea53;p=neurodebian.git

diff --git a/Makefile b/Makefile
index 3e2ceaf..4b9e35a 100644
--- a/Makefile
+++ b/Makefile
@@ -11,12 +11,16 @@ 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:
-	-rm html-stamp source-stamp
+	-rm html-stamp source-stamp upload-website-stamp
 	$(MAKE) -C artwork clean
 
 
@@ -26,11 +30,12 @@ distclean: clean
 
 source: source-stamp
 source-stamp: build/db.db
-	PYTHONPATH=. python neurodebian/dde.py \
+	PYTHONPATH=.:$(PYTHONPATH) python neurodebian/dde.py \
 		--cfg neurodebian.cfg \
 		--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
@@ -48,15 +53,23 @@ updatedb: removedb removecache build/db.db
 
 build/db.db:
 	mkdir -p build
-	PYTHONPATH=. python neurodebian/dde.py \
+	PYTHONPATH=.:$(PYTHONPATH) python neurodebian/dde.py \
 		--cfg neurodebian.cfg \
 		--db build/db.db \
 		updatedb
-	-rm source-stamp
+	-rm -f source-stamp
 
 
 upload-website: html
-	rsync -rvzlhp --delete --exclude=debian --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)
+	: # Touch stamp here so we get it updated on every upload
+	touch $@-stamp
+
+# call upload iff .git/index was modified, i.e. new changes got pulled in
+upload-website-stamp: .git/index
+	$(MAKE) upload-website
 
 .PHONY: removedb removecache updatedb upload-website clean distclean pics html