Merge with gitk --parents change.

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 4798933a493e56de73dd5ea6b560d2bcc5742843..7fad5ba0e9c98d7a442de581756e92f7afc666ef 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,7 +1,7 @@
 MAN1_TXT=$(wildcard git-*.txt)
 MAN7_TXT=git.txt
 
-DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT))
+DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT)) glossary.html
 
 DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT))
 DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
@@ -11,6 +11,7 @@ bin=$(prefix)/bin
 mandir=$(prefix)/man
 man1=$(mandir)/man1
 man7=$(mandir)/man7
+# DESTDIR=
 
 INSTALL=install
 
@@ -33,9 +34,9 @@ man1: $(DOC_MAN1)
 man7: $(DOC_MAN7)
 
 install:
-       $(INSTALL) -m755 -d $(dest)/$(man1) $(dest)/$(man7)
-       $(INSTALL) $(DOC_MAN1) $(dest)/$(man1)
-       $(INSTALL) $(DOC_MAN7) $(dest)/$(man7)
+       $(INSTALL) -m755 -d $(DESTDIR)/$(man1) $(DESTDIR)/$(man7)
+       $(INSTALL) $(DOC_MAN1) $(DESTDIR)/$(man1)
+       $(INSTALL) $(DOC_MAN7) $(DESTDIR)/$(man7)
 
 # 'include' dependencies
 git-diff-%.txt: diff-format.txt diff-options.txt
@@ -52,3 +53,9 @@ clean:
 
 %.xml : %.txt
        asciidoc -b docbook -d manpage $<
+
+glossary.html : glossary.txt sort_glossary.pl
+       cat $< | \
+       perl sort_glossary.pl | \
+       asciidoc -b xhtml11 - > glossary.html
+