summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2005-07-15 01:21:57 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-15 18:38:24 (GMT)
commit87a81c834bf48f8cbf8778cae78ed553f3bbd32c (patch)
tree882938d3f2622bfd3c7874a68f0fe20d6d9762d8
parent9dce3c0617ce7065eec53e8e3bb68c571f7d6ee5 (diff)
downloadgit-87a81c834bf48f8cbf8778cae78ed553f3bbd32c.zip
git-87a81c834bf48f8cbf8778cae78ed553f3bbd32c.tar.gz
git-87a81c834bf48f8cbf8778cae78ed553f3bbd32c.tar.bz2
[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>
-rw-r--r--Documentation/Makefile13
-rw-r--r--Makefile6
2 files changed, 19 insertions, 0 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 353fe7c..137f28f 100644
--- 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))
+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:
@@ -24,6 +32,11 @@ man: man1 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 $@
diff --git a/Makefile b/Makefile
index cf162a9..dd3c6cc 100644
--- a/Makefile
+++ b/Makefile
@@ -192,6 +192,12 @@ rpm: dist
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