Skip to content

Commit

Permalink
Allow INSTALL, bindir, mandir to be set in main Makefile
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jakub Narebski authored and Junio C Hamano committed Jun 30, 2006
1 parent fc046a7 commit e14421b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Documentation/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ template_dir = $(prefix)/share/git-core/templates/
GIT_PYTHON_DIR = $(prefix)/share/git-core/python
# DESTDIR=

export prefix bindir gitexecdir template_dir GIT_PYTHON_DIR

CC = gcc
AR = ar
TAR = tar
Expand Down
4 changes: 2 additions & 2 deletions contrib/emacs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
EMACS = emacs

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

all: $(ELC)
Expand Down
4 changes: 2 additions & 2 deletions contrib/git-svn/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
all: git-svn

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

0 comments on commit e14421b

Please sign in to comment.