[PATCH] Add doc and install-doc targets to the Makefile

This makes it straightforward for people wanting to build and install
the git man pages and the rest of the documentation to do so.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 353fe7c986b2ff1f5a60b28a1fe714fc01b25a78..137f28fe0ddad833d333499a8a6e31d6b14642f4 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -6,6 +6,14 @@ DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT))
 DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT))
 DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
 
 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
+
+INSTALL=install
+

 #
 # Please note that there is a minor bug in asciidoc.
 # The version after 6.0.3 _will_ include the patch found here:
 #
 # Please note that there is a minor bug in asciidoc.
 # The version after 6.0.3 _will_ include the patch found here:


@@ -24,6 +32,11 @@ man: man1 man7
 man1: $(DOC_MAN1)
 man7: $(DOC_MAN7)
 
 man1: $(DOC_MAN1)
 man7: $(DOC_MAN7)
 

+install:
+       $(INSTALL) -m755 -d $(dest)/$(man1) $(dest)/$(man7)
+       $(INSTALL) $(DOC_MAN1) $(dest)/$(man1)
+       $(INSTALL) $(DOC_MAN7) $(dest)/$(man7)
+

 # 'include' dependencies
 git-diff-%.txt: diff-format.txt diff-options.txt
        touch $@
 # 'include' dependencies
 git-diff-%.txt: diff-format.txt diff-options.txt
        touch $@

diff --git a/Makefile b/Makefile
index cf162a9daedc850c533f6326ba70b755f41d0c71..dd3c6ccb600823b06ec877034f998ab9d313bc75 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -192,6 +192,12 @@ rpm: dist
 test: all
        $(MAKE) -C t/ all
 
 test: all
        $(MAKE) -C t/ all
 

+doc:
+       $(MAKE) -C Documentation all
+
+install-doc:
+       $(MAKE) -C Documentation install
+

 clean:
        rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
        rm -f git-core-*.tar.gz git-core.spec
 clean:
        rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
        rm -f git-core-*.tar.gz git-core.spec