aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Ruemmler <kai.ruemmler@gmx.net>2005-10-08 15:54:37 -0700
committerJunio C Hamano <junkio@cox.net>2005-10-08 15:54:37 -0700
commitd2b8593fd3754cf2e0b9a121fe6ba63bfefa3a47 (patch)
tree3d9eb6fa46124b7e950ce29992a8ce79ef54a168
parentf48000fcbe1009c18f1cc46e56cde2cb632071fa (diff)
downloadgit-d2b8593fd3754cf2e0b9a121fe6ba63bfefa3a47.tar.gz
git-d2b8593fd3754cf2e0b9a121fe6ba63bfefa3a47.tar.xz
make $prefix available for sub-makefiles
exports $prefix and makes Documentation/Makefile following it also. Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/Makefile4
-rw-r--r--Makefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index bb21d6af4..3cfa360a9 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -17,14 +17,14 @@ DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES))
DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT))
DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
-prefix=$(HOME)
+prefix?=$(HOME)
bin=$(prefix)/bin
mandir=$(prefix)/man
man1=$(mandir)/man1
man7=$(mandir)/man7
# DESTDIR=
-INSTALL=install
+INSTALL?=install
#
# Please note that there is a minor bug in asciidoc.
diff --git a/Makefile b/Makefile
index 7ca77cf2a..bcda94327 100644
--- a/Makefile
+++ b/Makefile
@@ -293,7 +293,7 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
gitk
-export TAR INSTALL DESTDIR SHELL_PATH
+export prefix TAR INSTALL DESTDIR SHELL_PATH
### Build rules
all: $(PROGRAMS) $(SCRIPTS)