Make tig handle GIT_DIR better

[tig] / Makefile

diff --git a/Makefile b/Makefile
index c3e2a11..9d8c57b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,46 +1,74 @@
-PREFIX = $(HOME)
-LDFLAGS = -lcurses
-CFLAGS = '-DVERSION="$(VERSION)"' -Wall
-DFLAGS = -g -DDEBUG
+prefix = $(HOME)
+bindir= $(prefix)/bin
+mandir = $(prefix)/man
+docdir = $(prefix)/share/doc
+# DESTDIR=
+
+LDLIBS  = -lcurses
+CFLAGS = -Wall -O2
+DFLAGS = -g -DDEBUG -Werror
 PROGS  = tig
-DOCS   = tig.1.txt tig.1.html tig.1 README.html
-VERSION        = $(shell git-describe)
+DOCS   = tig.1.html tig.1 tigrc.5.html tigrc.5 \
+         manual.toc manual.html manual.html-chunked manual.pdf \
+         README.html
+
+ifneq (,$(wildcard .git))
+VERSION = $(shell git-describe)
+WTDIRTY = $(shell git-diff-index --name-only HEAD 2>/dev/null)
+CFLAGS += '-DVERSION="$(VERSION)$(if $(WTDIRTY),-dirty)"'
+endif
 
 all: $(PROGS)
 all-debug: $(PROGS)
 all-debug: CFLAGS += $(DFLAGS)
-docs: $(DOCS)
+doc: $(DOCS)
 
 install: all
+       mkdir -p $(DESTDIR)$(bindir) && \
        for prog in $(PROGS); do \
-               install $$prog $(PREFIX)/bin; \
+               install $$prog $(DESTDIR)$(bindir); \
        done
 
-install-docs: docs
+install-doc: doc
+       mkdir -p $(DESTDIR)$(mandir)/man1 \
+                $(DESTDIR)$(mandir)/man5 \
+                $(DESTDIR)$(docdir)/tig
        for doc in $(DOCS); do \
                case "$$doc" in \
-               *.1) install $$doc $(PREFIX)/man/man1 ;; \
+               *.1) install $$doc $(DESTDIR)$(mandir)/man1 ;; \
+               *.5) install $$doc $(DESTDIR)$(mandir)/man5 ;; \
+               *.html) install $$doc $(DESTDIR)$(docdir)/tig ;; \
                esac \
        done
 
 clean:
-       rm -f $(PROGS) $(DOCS) core
+       rm -rf manual.html-chunked
+       rm -f $(PROGS) $(DOCS) core *.xml
 
 spell-check:
-       aspell --lang=en --check tig.1.txt
+       aspell --lang=en --check tig.1.txt tigrc.5.txt manual.txt
 
-.PHONY: all docs install clean
+strip: all
+       strip $(PROGS)
 
-tig: tig.c
+.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.1.txt: tig.c
-       sed -n '/\/\*\*/,/\*\*\//p' < $< | \
-       sed 's/.*\*\*\///' | \
-       sed '/^[^*]*\*\*/d' | \
-       sed 's/\*\///;s/^[^*]*\* *//' > $@
+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 $<
@@ -50,3 +78,30 @@ README.html: README
 
 %.1 : %.1.xml
        xmlto man $<
+
+%.5.html : %.5.txt
+       asciidoc -b xhtml11 -d manpage $<
+
+%.5.xml : %.5.txt
+       asciidoc -b docbook -d manpage $<
+
+%.5 : %.5.xml
+       xmlto man $<
+
+%.html : %.txt
+       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