update htaccess files and makefile according to new setup

[~bandali/bndl.org] / Makefile

diff --git a/Makefile b/Makefile
index 2dc6d78..22073bd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,16 @@
-BASE_DIR = $(CURDIR)
-OUT_DIR  = $(BASE_DIR)/site/
+SRC := $(filter-out $(wildcard meta_*),$(wildcard *.m4))
+OUTPUTS := $(patsubst %.m4,out/%.html,$(SRC))
+STATIC := $(patsubst static/%,out/%,$(wildcard static/* static/.*))

 
 

-RSYNC_PARAMS = --exclude-from='.rsync-exclude' --delete -avzP
+all: $(OUTPUTS) out/notes.atom out/notes.rss out/style.css $(STATIC)

 
 

-SSH_USER = amin@shemshak.org
-SSH_DEST = /var/www/bandali.eu.org/
-
-all: build
-
-build:
-       haunt build
-
-watch: build
-       haunt serve --watch
+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:
 
 deploy:

-       rsync $(RSYNC_PARAMS) $(OUT_DIR) $(SSH_USER):$(SSH_DEST)
-
-clean:
-       [ ! -d $(OUT_DIR) ] || rm -rf $(OUT_DIR)
+       rsync -avzLP out/ abandali@bandali.eu.org:www/site/
+       ssh abandali@bandali.eu.org mv www/site/.htaccess-www www/.htaccess

 
 

-.PHONY: clean deploy
+.PHONY: deploy