Skip to content

Commit

Permalink
[PATCH] Use $DESTDIR instead of $dest
Browse files Browse the repository at this point in the history
$DESTDIR is more usual during the build than $dest and is what
is usually used in the makefiles, so let's use it too.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Petr Baudis authored and Junio C Hamano committed Aug 12, 2005
1 parent b05701c commit a682ef9
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
7 changes: 4 additions & 3 deletions Documentation/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ bin=$(prefix)/bin
mandir=$(prefix)/man
man1=$(mandir)/man1
man7=$(mandir)/man7
# DESTDIR=

INSTALL=install

Expand All @@ -33,9 +34,9 @@ man1: $(DOC_MAN1)
man7: $(DOC_MAN7)

install:
$(INSTALL) -m755 -d $(dest)/$(man1) $(dest)/$(man7)
$(INSTALL) $(DOC_MAN1) $(dest)/$(man1)
$(INSTALL) $(DOC_MAN7) $(dest)/$(man7)
$(INSTALL) -m755 -d $(DESTDIR)/$(man1) $(DESTDIR)/$(man7)
$(INSTALL) $(DOC_MAN1) $(DESTDIR)/$(man1)
$(INSTALL) $(DOC_MAN7) $(DESTDIR)/$(man7)

# 'include' dependencies
git-diff-%.txt: diff-format.txt diff-options.txt
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ALL_CFLAGS = $(CFLAGS) $(DEFINES)
prefix = $(HOME)
bindir = $(prefix)/bin
template_dir = $(prefix)/share/git-core/templates/
# dest=
# DESTDIR=

CC = gcc
AR = ar
Expand Down Expand Up @@ -209,8 +209,8 @@ check:
### Installation rules

install: $(PROG) $(SCRIPTS)
$(INSTALL) -m755 -d $(dest)$(bindir)
$(INSTALL) $(PROG) $(SCRIPTS) $(dest)$(bindir)
$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
$(INSTALL) $(PROG) $(SCRIPTS) $(DESTDIR)$(bindir)
$(MAKE) -C templates install

install-tools:
Expand Down
6 changes: 3 additions & 3 deletions templates/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
INSTALL=install
prefix=$(HOME)
template_dir=$(prefix)/share/git-core/templates/
# dest=
# DESTDIR=

all: boilerplates custom
find blt
Expand Down Expand Up @@ -34,5 +34,5 @@ clean:
rm -rf blt

install: all
$(INSTALL) -d -m755 $(dest)$(template_dir)
tar Ccf blt - . | tar Cxf $(dest)$(template_dir) -
$(INSTALL) -d -m755 $(DESTDIR)$(template_dir)
tar Ccf blt - . | tar Cxf $(DESTDIR)$(template_dir) -
4 changes: 2 additions & 2 deletions tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ALL_CFLAGS = $(CFLAGS)
INSTALL=install
prefix=$(HOME)
bindir=$(prefix)/bin
# dest=
# DESTDIR=

PROGRAMS=git-mailsplit git-mailinfo
SCRIPTS=git-applymbox git-applypatch
Expand All @@ -19,7 +19,7 @@ all: $(PROGRAMS)

install: $(PROGRAMS) $(SCRIPTS)
$(INSTALL) -m755 -d $(dest)$(bindir)
$(INSTALL) $(PROGRAMS) $(SCRIPTS) $(dest)$(bindir)
$(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir)

clean:
rm -f $(PROGRAMS) *.o

0 comments on commit a682ef9

Please sign in to comment.