@matheusbsbs / matheus-bagliano / commits / e14421b9aa
Fork 0

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>

Jakub Narebski committed Jun 29, 2006 at 22:11 UTC e14421b9aa85f11853a0dacae09498515daab7b8
4 files changed +8 -6
Documentation/Makefile
+2 -2
@@ -25,8 +25,8 @@ DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT))
25 DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
26
27 prefix?=$(HOME)
28 -bin=$(prefix)/bin
29 -mandir=$(prefix)/man
28 +bindir?=$(prefix)/bin
29 +mandir?=$(prefix)/man
30 man1=$(mandir)/man1
31 man7=$(mandir)/man7
32 # DESTDIR=
Makefile
+2
@@ -100,6 +100,8 @@ template_dir = $(prefix)/share/git-core/templates/
100 GIT_PYTHON_DIR = $(prefix)/share/git-core/python
101 # DESTDIR=
102
103 +export prefix bindir gitexecdir template_dir GIT_PYTHON_DIR
104 +
105 CC = gcc
106 AR = ar
107 TAR = tar
contrib/emacs/Makefile
+2 -2
@@ -3,9 +3,9 @@
3 EMACS = emacs
4
5 ELC = git.elc vc-git.elc
6 -INSTALL = install
6 +INSTALL ?= install
7 INSTALL_ELC = $(INSTALL) -m 644
8 -prefix = $(HOME)
8 +prefix ?= $(HOME)
9 emacsdir = $(prefix)/share/emacs/site-lisp
10
11 all: $(ELC)
contrib/git-svn/Makefile
+2 -2
@@ -1,8 +1,8 @@
1 all: git-svn
2
3 prefix?=$(HOME)
4 -bindir=$(prefix)/bin
5 -mandir=$(prefix)/man
4 +bindir?=$(prefix)/bin
5 +mandir?=$(prefix)/man
6 man1=$(mandir)/man1
7 INSTALL?=install
8 doc_conf=../../Documentation/asciidoc.conf