update htaccess files and makefile according to new setup

[~bandali/bndl.org] / Makefile

diff --git a/Makefile b/Makefile
index d4a1667..22073bd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 SRC := $(filter-out $(wildcard meta_*),$(wildcard *.m4))
 OUTPUTS := $(patsubst %.m4,out/%.html,$(SRC))
-STATIC := $(patsubst static/%,out/%,$(wildcard static/*))
+STATIC := $(patsubst static/%,out/%,$(wildcard static/* static/.*))
 
 all: $(OUTPUTS) out/notes.atom out/notes.rss out/style.css $(STATIC)
 
@@ -10,6 +10,7 @@ out/notes.rss: meta_feed_rss.m4 ; m4 $< > $@
 $(STATIC): ; ln -s $(PWD)/static/$(notdir $@) $@
 
 deploy:
-       rsync -avzLP out/ abandali@bandali.eu.org:www/
+       rsync -avzLP out/ abandali@bandali.eu.org:www/site/
+       ssh abandali@bandali.eu.org mv www/site/.htaccess-www www/.htaccess
 
 .PHONY: deploy