Skip to content

Commit

Permalink
make $prefix available for sub-makefiles
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Kai Ruemmler authored and Junio C Hamano committed Oct 8, 2005
1 parent f48000f commit d2b8593
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Documentation/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit d2b8593

Please sign in to comment.