X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=Makefile;h=b5bcebdb7b92c27f0287e463189021aadd52e815;hb=f50a814446587698da2d35af6319bfcd30b83673;hp=e320708d23f290c984888ecbe6bdf55cb4de313a;hpb=78c943892ed526ea4ce6cd068bf551f08cbb1151;p=rrq%2Fhourglass.git

diff --git a/Makefile b/Makefile
index e320708..b5bcebd 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ MAIN = command.lsp
 LSP = $(filter-out $(MAIN),$(wildcard *.lsp))
 BIN = hourglass hourglass-web hourglass-site
 DOCS = hourglass-guide.html hourglass-guide.pdf
-MANPGS = hourglass.8
+MANPGS = hourglass.8 hourglass-site.8 hourglass-web.8
 IMGS = $(wildcard *.png)
 OTHER = setup.sh hourglass.conf
 VERSION = 0.1
@@ -22,7 +22,7 @@ hourglass-site: sitetool
 	mv sitetool/sitetool $@
 
 %.html: %.adoc
-	asciidoctor $< > $@
+	asciidoctor -a 'webfonts!' $< > $@
 
 %.pdf: %.adoc | $(IMGS)
 	asciidoctor-pdf $< > $@
@@ -43,8 +43,8 @@ hourglass-$(VERSION).tgz: $(BIN) $(OTHER) $(DOCS) $(MANPGS) $(IMGS)
 dist: hourglass-$(VERSION).tgz
 
 ########################################################
-BINDIR = $(DESTDIR)/usr/local/bin
-MANDIR = $(DESTDIR)/usr/local/man/man8
+BINDIR = $(DESTDIR)/usr/bin
+MANDIR = $(DESTDIR)/usr/share/man/man8
 RUNDIR = $(DESTDIR)/var/lib/hourglass
 DOCDIR = $(DESTDIR)/usr/share/hourglass
 
@@ -53,8 +53,15 @@ INSTALLTARGETS += $(addprefix $(MANDIR)/,$(MANPGS))
 INSTALLTARGETS += $(addprefix $(DOCDIR)/,$(DOCS))
 INSTALLTARGETS += $(addprefix $(RUNDIR)/,$(OTHER))
 
+$(RUNDIR)/%.conf: %.conf
+	install -D -T $< $@
+	chmod a-x $@
+
+$(MANDIR)/% $(DOCDIR)/%:%
+	install -D -T $< $@
+	chmod a-x $@
 
-$(BINDIR)/% $(MANDIR)/% $(RUNDIR)/% $(DOCDIR)/%: %
+$(BINDIR)/% $(RUNDIR)/%: %
 	install -D -T $< $@
 
 install: $(INSTALLTARGETS)