diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-09 00:38:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-09 00:38:14 (GMT) |
| commit | 14ba45a2e68c296cb2b5bc5e77fdaa0846fb77de (patch) | |
| tree | 50908aa6bd9e8d577a5702368a04e07a89612ec4 /Documentation/Makefile | |
| parent | 4cb6764227173a6483edbdad09121651bc0b01c3 (diff) | |
| parent | d4d5ab4727edd1758157dd0b61c1ff3b7deabfcd (diff) | |
| download | git-14ba45a2e68c296cb2b5bc5e77fdaa0846fb77de.zip git-14ba45a2e68c296cb2b5bc5e77fdaa0846fb77de.tar.gz git-14ba45a2e68c296cb2b5bc5e77fdaa0846fb77de.tar.bz2 | |
Sync with 1.7.7.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/Makefile')
| -rw-r--r-- | Documentation/Makefile | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 5513256..304b31e 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -46,8 +46,8 @@ MANPAGE_XSL = manpage-normal.xsl XMLTO_EXTRA = INSTALL?=install RM ?= rm -f -DOC_REF = origin/man -HTML_REF = origin/html +MAN_REPO = ../../git-manpages +HTML_REPO = ../../git-htmldocs infodir?=$(prefix)/share/info MAKEINFO=makeinfo @@ -327,12 +327,23 @@ $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt install-webdoc : html '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(WEBDOC_DEST) +# You must have a clone of git-htmldocs and git-manpages repositories +# next to the git repository itself for the following to work. + quick-install: quick-install-man -quick-install-man: - '$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir) +require-manrepo:: + @if test ! -d $(MAN_REPO); \ + then echo "git-manpages repository must exist at $(MAN_REPO)"; exit 1; fi + +quick-install-man: require-manrepo + '$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(MAN_REPO) $(DESTDIR)$(mandir) + +require-htmlrepo:: + @if test ! -d $(HTML_REPO); \ + then echo "git-htmldocs repository must exist at $(HTML_REPO)"; exit 1; fi -quick-install-html: - '$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(HTML_REF) $(DESTDIR)$(htmldir) +quick-install-html: require-htmlrepo + '$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(HTML_REPO) $(DESTDIR)$(htmldir) .PHONY: FORCE |