whoops, forgot a dnl

[~bandali/bndl.org] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index fb9fc11..bbf2bb5 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,4 +1,4 @@
-SRC := $(filter-out $(wildcard meta_*), $(wildcard *.m4 fsf-internship/*.m4))
+SRC := $(filter-out $(wildcard meta_*), $(wildcard *.m4))

 OUTPUTS := $(patsubst %.m4,out/%.html, $(SRC))
 STATIC := $(patsubst static/%,out/%, $(filter-out static/GNUmakefile, $(wildcard static/* static/.*)))
 
 OUTPUTS := $(patsubst %.m4,out/%.html, $(SRC))
 STATIC := $(patsubst static/%,out/%, $(filter-out static/GNUmakefile, $(wildcard static/* static/.*)))
 


@@ -7,8 +7,9 @@ all: $(OUTPUTS) out/notes.atom out/notes.rss out/style.css out/GNUmakefile $(STA
 out/%.html: %.m4 header.html footer.html
        @mkdir -p $(@D)
        m4 $< > $@
 out/%.html: %.m4 header.html footer.html
        @mkdir -p $(@D)
        m4 $< > $@

-out/notes.atom: meta_feed_atom.m4 ; m4 $< > $@
-out/notes.rss: meta_feed_rss.m4 ; m4 $< > $@
+out/notes.%: meta_feed_%.m4 $(SRC) header.html footer.html
+       m4 $< > $@
+       sed -i 's|href="/\([^/]\)|href="https://bndl.org/\1|' $@

 out/GNUmakefile: GNUmakefile ; ln -s $(PWD)/$< $@
 $(STATIC): ; ln -s $(PWD)/static/$(@F) $@
 
 out/GNUmakefile: GNUmakefile ; ln -s $(PWD)/$< $@
 $(STATIC): ; ln -s $(PWD)/static/$(@F) $@
 


@@ -24,8 +25,8 @@ clean:
        rm -rf out/
 
 deploy:
        rm -rf out/
 
 deploy:

-       rsync -avzLP out/ abandali@bndl.org:www/site/
-       ssh abandali@bndl.org mv www/site/.htaccess-www www/.htaccess
+       rsync -avzLP out/ abandali@bndl.org:www/bndl.org/
+#      ssh abandali@bndl.org mv www/bndl.org/.htaccess-www www/.htaccess

 
 watch:
        while true; do \
 
 watch:
        while true; do \