development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 02:57:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

[PATCH] Use $DESTDIR instead of $dest

Browse source 
$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>
This commit is contained in:
Petr Baudis 2005-08-05 01:56:38 +02:00 committed by Junio C Hamano
parent b05701c5b4
commit a682ef9f06
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Documentation/Makefile
View file

@ -11,6 +11,7 @@ bin=$(prefix)/bin
mandir=$(prefix)/man
man1=$(mandir)/man1
man7=$(mandir)/man7
# DESTDIR=
INSTALL=install
@ -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

6
Makefile
View file

@ -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
@ -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:

6
templates/Makefile
View file

@ -3,7 +3,7 @@
INSTALL=install
prefix=$(HOME)
template_dir=$(prefix)/share/git-core/templates/
# dest=
# DESTDIR=
all: boilerplates custom
find blt
@ -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
tools/Makefile
View file

@ -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
@ -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