diff options
| author | Jakub Narebski <jnareb@gmail.com> | 2006-06-29 22:11:25 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-30 08:49:16 +0200 |
| commit | e14421b9aa85f11853a0dacae09498515daab7b8 (patch) | |
| tree | 8995222b849f95902d3ed66b8c2cb11d55d4a87e /Documentation/Makefile | |
| parent | Abstract out accesses to object hash array (diff) | |
| download | git-e14421b9aa85f11853a0dacae09498515daab7b8.tar.xz git-e14421b9aa85f11853a0dacae09498515daab7b8.zip | |
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/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 2b0efe7921..ca6b77df28 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= |