aboutsummaryrefslogtreecommitdiff
path: root/Documentation/Makefile
diff options
context:
space:
mode:
authorJakub Narebski <jnareb@gmail.com>2006-06-29 22:11:25 +0200
committerJunio C Hamano <junkio@cox.net>2006-06-29 23:49:16 -0700
commite14421b9aa85f11853a0dacae09498515daab7b8 (patch)
tree8995222b849f95902d3ed66b8c2cb11d55d4a87e /Documentation/Makefile
parentfc046a75d539a78e6b2c16534c4078617a69a327 (diff)
downloadgit-e14421b9aa85f11853a0dacae09498515daab7b8.tar.gz
git-e14421b9aa85f11853a0dacae09498515daab7b8.tar.xz
Allow INSTALL, bindir, mandir to be set in main Makefile
Makefiles in subdirectories now use existing value of INSTALL, bindir, mandir if it is set, allowing those to be set in main Makefile or in included config.mak. Main Makefile exports variables which it sets. Accidentally it renames bin to bindir in Documentation/Makefile (should be bindir from start, but is unused, perhaps to be removed). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/Makefile')
-rw-r--r--Documentation/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 2b0efe792..ca6b77df2 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -25,8 +25,8 @@ DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT))
DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
prefix?=$(HOME)
-bin=$(prefix)/bin
-mandir=$(prefix)/man
+bindir?=$(prefix)/bin
+mandir?=$(prefix)/man
man1=$(mandir)/man1
man7=$(mandir)/man7
# DESTDIR=