update htaccess files and makefile according to new setup

[~bandali/bndl.org] / Makefile

diff --git a/Makefile b/Makefile
index b4e1909..22073bd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,16 @@
-RSYNC_PARAMS = --exclude-from='.rsync-exclude' -avzLP
-
-LATEST=2
-SRC := $(filter-out $(wildcard feed_*),$(wildcard *.m4))
+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)
 
-out/%.html: %.m4 header.html footer.html ; m4 -D__latest=$(LATEST) $< > $@
-out/notes.atom: feed_atom.m4 ; m4 -D__latest=$(LATEST) $< > $@
-out/notes.rss: feed_rss.m4 ; m4 -D__latest=$(LATEST) $< > $@
+out/%.html: %.m4 header.html footer.html ; m4 $< > $@
+out/notes.atom: meta_feed_atom.m4 ; m4 $< > $@
+out/notes.rss: meta_feed_rss.m4 ; m4 $< > $@
 $(STATIC): ; ln -s $(PWD)/static/$(notdir $@) $@
 
 deploy:
-       rsync $(RSYNC_PARAMS) 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