X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2FMakefile;h=bb21d6af44e6aa591c2adb33e0447853ac1c65c5;hb=df8baa42fe4eeb5a021ac262caf601f44d2a5746;hp=b23991d52b245dd3ae267941f83e540bf0f4b2e5;hpb=f1a7eb36b017c62d9a007b6b8660bdeec3f94f97;p=git.git

diff --git a/Documentation/Makefile b/Documentation/Makefile
index b23991d5..bb21d6af 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,24 +1,96 @@
-DOC_SRC=$(wildcard git*.txt)
-DOC_HTML=$(patsubst %.txt,%.html,$(DOC_SRC))
-DOC_MAN=$(patsubst %.txt,%.1,$(DOC_SRC))
+MAN1_TXT=$(wildcard git-*.txt) gitk.txt
+MAN7_TXT=git.txt
 
-all: $(DOC_HTML) $(DOC_MAN)
+DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT))
+
+ARTICLES = tutorial
+ARTICLES += cvs-migration
+ARTICLES += diffcore
+ARTICLES += howto-index
+ARTICLES += repository-layout
+ARTICLES += hooks
+# with their own formatting rules.
+SP_ARTICLES = glossary howto/revert-branch-rebase
+
+DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES))
+
+DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT))
+DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
+
+prefix=$(HOME)
+bin=$(prefix)/bin
+mandir=$(prefix)/man
+man1=$(mandir)/man1
+man7=$(mandir)/man7
+# DESTDIR=
+
+INSTALL=install
+
+#
+# Please note that there is a minor bug in asciidoc.
+# The version after 6.0.3 _will_ include the patch found here:
+#   http://marc.theaimsgroup.com/?l=git&m=111558757202243&w=2
+#
+# Until that version is released you may have to apply the patch
+# yourself - yes, all 6 characters of it!
+#
+
+all: html man
 
 html: $(DOC_HTML)
 
-man: $(DOC_MAN)
 
-git-%: %.c $(LIB_FILE)
-	$(CC) $(CFLAGS) -o $@ $(filter %.c,$^) $(LIBS)
+man: man1 man7
+man1: $(DOC_MAN1)
+man7: $(DOC_MAN7)
+
+install: man
+	$(INSTALL) -d -m755 $(DESTDIR)/$(man1) $(DESTDIR)/$(man7)
+	$(INSTALL) $(DOC_MAN1) $(DESTDIR)/$(man1)
+	$(INSTALL) $(DOC_MAN7) $(DESTDIR)/$(man7)
+
+# 'include' dependencies
+$(patsubst %.txt,%.1,$(wildcard git-diff-*.txt)): \
+	diff-format.txt diff-options.txt
+$(patsubst %,%.1,git-fetch git-pull git-push): pull-fetch-param.txt
+$(patsubst %.txt,%.html,$(wildcard git-diff-*.txt)): \
+	diff-format.txt diff-options.txt
+$(patsubst %,%.html,git-fetch git-pull git-push): pull-fetch-param.txt
+git.7: ../README
 
 clean:
-	rm -f *.xml *.html *.1
+	rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html
 
 %.html : %.txt
-	asciidoc -b css-embedded -d manpage $<
+	asciidoc -b xhtml11 -d manpage -f asciidoc.conf $<
 
-%.1 : %.xml
+%.1 %.7 : %.xml
 	xmlto man $<
 
 %.xml : %.txt
-	asciidoc -b docbook -d manpage $<
+	asciidoc -b docbook -d manpage -f asciidoc.conf $<
+
+git.html: git.txt ../README
+
+glossary.html : glossary.txt sort_glossary.pl
+	cat $< | \
+	perl sort_glossary.pl | \
+	asciidoc -b xhtml11 - > glossary.html
+
+howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
+	rm -f $@+ $@
+	sh ./howto-index.sh $(wildcard howto/*.txt) >$@+
+	mv $@+ $@
+
+$(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
+	asciidoc -b xhtml11 $*.txt
+
+WEBDOC_DEST = /pub/software/scm/git/docs
+
+$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
+	rm -f $@+ $@
+	sed -e '1,/^$$/d' $? | asciidoc -b xhtml11 - >$@+
+	mv $@+ $@
+
+install-webdoc : html
+	sh ./install-webdoc.sh $(WEBDOC_DEST)