contact: move link to pubkey a bit higher up

[~bandali/bndl.org] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index f5b4014..ae9eab7 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -8,8 +8,7 @@
 # without any warranty.
 
 
-gen = perl txt2html < $< > $@
-gen_fa = perl txt2html --lang='fa' < $< > $@
+gen-html = perl txt2pre $(1) < $< > $@
 port := $(if $(port),$(port),8000)
 
 TXT := $(filter-out bandali-pubkey.txt bandali.txt,$(wildcard *.txt))
@@ -22,13 +21,13 @@ OUT_FA := $(patsubst fa/bandali-%.html,fa/%.html,$(OUT_FA))
 
 all: $(OUT) $(OUT_FA) index.html fa/index.html
 
-%.html: bandali-%.txt ; $(gen)
-%.html: %.txt ; $(gen)
-index.html: bandali.txt ; $(gen)
+%.html: bandali-%.txt; $(gen-html)
+%.html: %.txt; $(gen-html)
+index.html: bandali.txt; $(call gen-html,--index)
 
-fa/%.html: fa/bandali-%.fa.txt ; $(gen_fa)
-fa/%.html: fa/%.fa.txt ; $(gen_fa)
-fa/index.html: fa/bandali.fa.txt ; $(gen_fa)
+fa/%.html: fa/bandali-%.fa.txt; $(call gen-html,--lang='fa')
+fa/%.html: fa/%.fa.txt; $(call gen-html,--lang='fa')
+fa/index.html: fa/bandali.fa.txt; $(call gen-html,--lang='fa' --index)
 
 
 clean:
@@ -40,6 +39,6 @@ serve:
 watch:
        while true; do \
        echo $(TXT) $(TXT_FA) bandali.txt fa/bandali.fa.txt \
-       GNUmakefile txt2html | tr " " "\n" | entr -d make; done
+       GNUmakefile txt2pre | tr " " "\n" | entr -d make; done
 
 .PHONY: all clean serve watch