Add version information to man pages

[tig] / Makefile

diff --git a/Makefile b/Makefile
index 7bebefd..5e96234 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,40 +8,56 @@ LDLIBS  = -lcurses
 CFLAGS = -Wall -O2
 DFLAGS = -g -DDEBUG -Werror
 PROGS  = tig
-DOCS   = tig.1.html tig.1 tigrc.5.html tigrc.5 \
-         manual.toc manual.html manual.html-chunked README.html \
+DOCS_MAN       = tig.1 tigrc.5
+DOCS_HTML      = tig.1.html tigrc.5.html \
+                 manual.html manual.html-chunked \
+                 README.html
+DOCS   = $(DOCS_MAN) $(DOCS_HTML) \
+         manual.toc manual.pdf
 
 ifneq (,$(wildcard .git))
-VERSION = $(shell git-describe)
-WTDIRTY = $(shell git-diff-index --name-only HEAD 2>/dev/null)
-CFLAGS += '-DVERSION="$(VERSION)$(if $(WTDIRTY),-dirty)"'
+GITDESC = $(subst tig-,,$(shell git describe))
+WTDIRTY = $(if $(shell git-diff-index HEAD 2>/dev/null),-dirty)
+VERSION = $(GITDESC)$(WTDIRTY)
+CFLAGS += '-DVERSION="tig-$(VERSION)"'
 endif
 
 all: $(PROGS)
 all-debug: $(PROGS)
 all-debug: CFLAGS += $(DFLAGS)
 doc: $(DOCS)
+doc-man: $(DOCS_MAN)
+doc-html: $(DOCS_HTML)
 
 install: all
+       mkdir -p $(DESTDIR)$(bindir) && \
        for prog in $(PROGS); do \
                install $$prog $(DESTDIR)$(bindir); \
        done
 
-install-doc: doc
+install-doc-man: doc-man
        mkdir -p $(DESTDIR)$(mandir)/man1 \
-                $(DESTDIR)$(mandir)/man5 \
-                $(DESTDIR)$(docdir)/tig
+                $(DESTDIR)$(mandir)/man5
        for doc in $(DOCS); do \
                case "$$doc" in \
                *.1) install $$doc $(DESTDIR)$(mandir)/man1 ;; \
                *.5) install $$doc $(DESTDIR)$(mandir)/man5 ;; \
+               esac \
+       done
+
+install-doc-html: doc-html
+       mkdir -p $(DESTDIR)$(docdir)/tig
+       for doc in $(DOCS); do \
+               case "$$doc" in \
                *.html) install $$doc $(DESTDIR)$(docdir)/tig ;; \
                esac \
        done
 
+install-doc: install-doc-man install-doc-html
+
 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
@@ -49,8 +65,9 @@ spell-check:
 strip: all
        strip $(PROGS)
 
-.PHONY: all all-debug doc install install-doc clean spell-check
+.PHONY: all all-debug doc doc-man doc-html install install-doc install-doc-man install-doc-html clean spell-check
 
+manual.html: manual.toc
 manual.toc: manual.txt
        sed -n '/^\[\[/,/\(---\|~~~\)/p' < $< | while read line; do \
                case "$$line" in \
@@ -65,23 +82,26 @@ tig: tig.c
 README.html: README
        asciidoc -b xhtml11 -d article -a readme $<
 
+%.pdf : %.xml
+       docbook2pdf $<
+
 %.1.html : %.1.txt
        asciidoc -b xhtml11 -d manpage $<
 
 %.1.xml : %.1.txt
-       asciidoc -b docbook -d manpage $<
+       asciidoc -b docbook -d manpage -aversion=$(VERSION) $<
 
 %.1 : %.1.xml
-       xmlto man $<
+       xmlto -m manpage.xsl man $<
 
 %.5.html : %.5.txt
        asciidoc -b xhtml11 -d manpage $<
 
 %.5.xml : %.5.txt
-       asciidoc -b docbook -d manpage $<
+       asciidoc -b docbook -d manpage -aversion=$(VERSION) $<
 
 %.5 : %.5.xml
-       xmlto man $<
+       xmlto -m manpage.xsl man $<
 
 %.html : %.txt
        asciidoc -b xhtml11 -d article -n $<
@@ -91,3 +111,12 @@ README.html: README
 
 %.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