Make tig handle GIT_DIR better

[tig] / Makefile

diff --git a/Makefile b/Makefile
index 7bebefd..9d8c57b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,8 @@ 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 \
+         manual.toc manual.html manual.html-chunked manual.pdf \
+         README.html
 
 ifneq (,$(wildcard .git))
 VERSION = $(shell git-describe)
@@ -23,6 +24,7 @@ all-debug: CFLAGS += $(DFLAGS)
 doc: $(DOCS)
 
 install: all
+       mkdir -p $(DESTDIR)$(bindir) && \
        for prog in $(PROGS); do \
                install $$prog $(DESTDIR)$(bindir); \
        done
@@ -41,7 +43,7 @@ install-doc: doc
 
 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
@@ -65,6 +67,9 @@ 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 $<
 
@@ -91,3 +96,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