X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=4b9e35a7c432e465bdc0be57ec29b89b60395f49;hb=098f8e6b42a310977c858117f9de30317d367b2a;hp=94886961acd0c1e30496000cbcbebd310c1afe95;hpb=e3701840088feb643981f2913aa26e52b063b5ab;p=neurodebian.git

diff --git a/Makefile b/Makefile
index 9488696..4b9e35a 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,11 @@ html: pics source
 	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
 
 
@@ -29,7 +30,7 @@ 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 \
@@ -52,7 +53,7 @@ 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
@@ -61,8 +62,14 @@ build/db.db:
 
 upload-website: html
 	rsync -rvzlhp --delete \
-        --exclude=debian --exclude=debian-local --exclude=_files --exclude=survey \
+        --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