Make tig handle GIT_DIR better

[tig] / Makefile

diff --git a/Makefile b/Makefile
index 6d595f4..9d8c57b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 prefix = $(HOME)
 bindir= $(prefix)/bin
 mandir = $(prefix)/man
+docdir = $(prefix)/share/doc
 # DESTDIR=
 
 LDLIBS  = -lcurses
@@ -8,7 +9,8 @@ CFLAGS  = -Wall -O2
 DFLAGS = -g -DDEBUG -Werror
 PROGS  = tig
 DOCS   = tig.1.html tig.1 tigrc.5.html tigrc.5 \
-         manual.html manual.html-chunked README.html
+         manual.toc manual.html manual.html-chunked manual.pdf \
+         README.html
 
 ifneq (,$(wildcard .git))
 VERSION = $(shell git-describe)
@@ -22,22 +24,26 @@ all-debug: CFLAGS += $(DFLAGS)
 doc: $(DOCS)
 
 install: all
+       mkdir -p $(DESTDIR)$(bindir) && \
        for prog in $(PROGS); do \
                install $$prog $(DESTDIR)$(bindir); \
        done
 
 install-doc: doc
-       mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5
+       mkdir -p $(DESTDIR)$(mandir)/man1 \
+                $(DESTDIR)$(mandir)/man5 \
+                $(DESTDIR)$(docdir)/tig
        for doc in $(DOCS); do \
                case "$$doc" in \
                *.1) install $$doc $(DESTDIR)$(mandir)/man1 ;; \
                *.5) install $$doc $(DESTDIR)$(mandir)/man5 ;; \
+               *.html) install $$doc $(DESTDIR)$(docdir)/tig ;; \
                esac \
        done
 
 clean:
        rm -rf manual.html-chunked
-       rm -f $(PROGS) $(DOCS) core
+       rm -f $(PROGS) $(DOCS) core *.xml
 
 spell-check:
        aspell --lang=en --check tig.1.txt tigrc.5.txt manual.txt
@@ -47,10 +53,22 @@ strip: all
 
 .PHONY: all all-debug doc install install-doc clean spell-check
 
+manual.toc: manual.txt
+       sed -n '/^\[\[/,/\(---\|~~~\)/p' < $< | while read line; do \
+               case "$$line" in \
+               "-----"*)  echo ". <<$$ref>>"; ref= ;; \
+               "~~~~~"*)  echo "- <<$$ref>>"; ref= ;; \
+               "[["*"]]") ref="$$line" ;; \
+               *)         ref="$$ref, $$line" ;; \
+               esac; done | sed 's/\[\[\(.*\)\]\]/\1/' > $@
+
 tig: tig.c
 
 README.html: README
-       asciidoc -b xhtml11 -d article -f web.conf $<
+       asciidoc -b xhtml11 -d article -a readme $<
+
+%.pdf : %.xml
+       docbook2pdf $<
 
 %.1.html : %.1.txt
        asciidoc -b xhtml11 -d manpage $<
@@ -71,10 +89,19 @@ README.html: README
        xmlto man $<
 
 %.html : %.txt
-       asciidoc -b xhtml11 -d article $<
+       asciidoc -b xhtml11 -d article -n $<
 
 %.xml : %.txt
        asciidoc -b docbook -d article $<
 
 %.html-chunked : %.xml
        xmlto html -o $@ $<
+
+# Maintainer stuff
+sync-docs:
+       cg switch release
+       -cg merge -n master
+       cg commit -m "Merge with master"
+       make doc
+       cg commit -m "Sync docs"
+       cg switch master