Merge branch 'master' of ssh://alioth.debian.org/git/pkg-exppsy/neurodebian

[neurodebian.git] / Makefile

diff --git a/Makefile b/Makefile
index fb0bc49bf6f00a19901ab1014ee0e9ff7546838f..97e75699974e13822046208e27d457fbfd6db8a0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,9 +9,11 @@ pics:
        $(MAKE) -C artwork
 
 
-html: pics source
+html: pics
        rsync -rvlhp sphinx/ build/src
+       cd artwork;     cp button_w200.png logo_tuned/fmri_w200.png ../build/src/_static; cd ..
        cd build/src && $(MAKE) html BUILDDIR=$(CURDIR)/build 2>&1
+       mv $(WWW_DIR)/_static/robots.txt $(WWW_DIR)/
 
 
 clean:
@@ -39,7 +41,7 @@ removecache:
        -rm -rf build/cache
 
 removedb:
-       -rm build/db.db
+       -rm -f build/db.db
 
 
 updatedb: removedb removecache build/db.db
@@ -51,11 +53,11 @@ 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 --chmod=Dg+s,g+rw $(WWW_DIR) $(WWW_UPLOAD_URI)
+       rsync -rvzlhp --delete --exclude=debian --exclude=debian-local --chmod=Dg+s,g+rw $(WWW_DIR) $(WWW_UPLOAD_URI)
 
 .PHONY: removedb removecache updatedb upload-website clean distclean pics html