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>
maint
Jakub Narebski 2006-06-29 22:11:25 +02:00 committed by Junio C Hamano
parent fc046a75d5
commit e14421b9aa
4 changed files with 8 additions and 6 deletions

View File

@ -25,8 +25,8 @@ DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT))
DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT)) DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))


prefix?=$(HOME) prefix?=$(HOME)
bin=$(prefix)/bin bindir?=$(prefix)/bin
mandir=$(prefix)/man mandir?=$(prefix)/man
man1=$(mandir)/man1 man1=$(mandir)/man1
man7=$(mandir)/man7 man7=$(mandir)/man7
# DESTDIR= # DESTDIR=

View File

@ -100,6 +100,8 @@ template_dir = $(prefix)/share/git-core/templates/
GIT_PYTHON_DIR = $(prefix)/share/git-core/python GIT_PYTHON_DIR = $(prefix)/share/git-core/python
# DESTDIR= # DESTDIR=


export prefix bindir gitexecdir template_dir GIT_PYTHON_DIR

CC = gcc CC = gcc
AR = ar AR = ar
TAR = tar TAR = tar

View File

@ -3,9 +3,9 @@
EMACS = emacs EMACS = emacs


ELC = git.elc vc-git.elc ELC = git.elc vc-git.elc
INSTALL = install INSTALL ?= install
INSTALL_ELC = $(INSTALL) -m 644 INSTALL_ELC = $(INSTALL) -m 644
prefix = $(HOME) prefix ?= $(HOME)
emacsdir = $(prefix)/share/emacs/site-lisp emacsdir = $(prefix)/share/emacs/site-lisp


all: $(ELC) all: $(ELC)

View File

@ -1,8 +1,8 @@
all: git-svn all: git-svn


prefix?=$(HOME) prefix?=$(HOME)
bindir=$(prefix)/bin bindir?=$(prefix)/bin
mandir=$(prefix)/man mandir?=$(prefix)/man
man1=$(mandir)/man1 man1=$(mandir)/man1
INSTALL?=install INSTALL?=install
doc_conf=../../Documentation/asciidoc.conf doc_conf=../../Documentation/asciidoc.conf