removed circularity in makefile

[OldStandard] / makefile

diff --git a/makefile b/makefile
index b03424f1aa0a89ed4157b089a5a0ca112a4b5d7f..8f798c8b0011e453f54de9d3c8acc8a13bb97cb1 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,24 +1,32 @@
-pkg := oldstandard-t
+pkg := oldstandard
 ver  := $(shell grep '\\edef\\pkgver' $(pkg).tex | grep -Eo '[0-9]?\.[0-9]?')
 TEXMFDIR := $(shell kpsewhich -expand-var='$$TEXMFHOME')
 HOMEDIR := $$HOME
+LOCALFONTDIR := $(HOMEDIR)/.local/share/fonts
 
-doc: clean
+doc: local
        lualatex --shell-escape $(pkg).tex
        biber $(pkg)
        lualatex --shell-escape $(pkg).tex
        lualatex --shell-escape $(pkg).tex
 
-all: clean doc
+all: doc
 
-package: clean doc
+local:
+       rm -f $(LOCALFONTDIR)/OldStandard-*.otf
+       cp otf/OldStandard-*.otf $(LOCALFONTDIR)/
+       luaotfload-tool --update
+
+package: doc
        mkdir $(pkg)
        cp *.{txt,md,tex,pdf} $(pkg)
        cp otf/*.otf $(pkg)
        tar czf $(pkg)-$(ver).tar.gz $(pkg)
 
-clean:
+clean: doc
+       rm -f $(LOCALFONTDIR)/OldStandard-*.otf
+       luaotfload-tool --update
        git clean -df
        pandoc README.md -o about.html
 
-.PHONY: doc all package clean
+.PHONY: doc all local package clean