mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
[PATCH] Use $DESTDIR instead of $dest
$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:
parent
b05701c5b4
commit
a682ef9f06
|
@ -11,6 +11,7 @@ bin=$(prefix)/bin
|
||||||
mandir=$(prefix)/man
|
mandir=$(prefix)/man
|
||||||
man1=$(mandir)/man1
|
man1=$(mandir)/man1
|
||||||
man7=$(mandir)/man7
|
man7=$(mandir)/man7
|
||||||
|
# DESTDIR=
|
||||||
|
|
||||||
INSTALL=install
|
INSTALL=install
|
||||||
|
|
||||||
|
@ -33,9 +34,9 @@ man1: $(DOC_MAN1)
|
||||||
man7: $(DOC_MAN7)
|
man7: $(DOC_MAN7)
|
||||||
|
|
||||||
install:
|
install:
|
||||||
$(INSTALL) -m755 -d $(dest)/$(man1) $(dest)/$(man7)
|
$(INSTALL) -m755 -d $(DESTDIR)/$(man1) $(DESTDIR)/$(man7)
|
||||||
$(INSTALL) $(DOC_MAN1) $(dest)/$(man1)
|
$(INSTALL) $(DOC_MAN1) $(DESTDIR)/$(man1)
|
||||||
$(INSTALL) $(DOC_MAN7) $(dest)/$(man7)
|
$(INSTALL) $(DOC_MAN7) $(DESTDIR)/$(man7)
|
||||||
|
|
||||||
# 'include' dependencies
|
# 'include' dependencies
|
||||||
git-diff-%.txt: diff-format.txt diff-options.txt
|
git-diff-%.txt: diff-format.txt diff-options.txt
|
||||||
|
|
6
Makefile
6
Makefile
|
@ -40,7 +40,7 @@ ALL_CFLAGS = $(CFLAGS) $(DEFINES)
|
||||||
prefix = $(HOME)
|
prefix = $(HOME)
|
||||||
bindir = $(prefix)/bin
|
bindir = $(prefix)/bin
|
||||||
template_dir = $(prefix)/share/git-core/templates/
|
template_dir = $(prefix)/share/git-core/templates/
|
||||||
# dest=
|
# DESTDIR=
|
||||||
|
|
||||||
CC = gcc
|
CC = gcc
|
||||||
AR = ar
|
AR = ar
|
||||||
|
@ -209,8 +209,8 @@ check:
|
||||||
### Installation rules
|
### Installation rules
|
||||||
|
|
||||||
install: $(PROG) $(SCRIPTS)
|
install: $(PROG) $(SCRIPTS)
|
||||||
$(INSTALL) -m755 -d $(dest)$(bindir)
|
$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
|
||||||
$(INSTALL) $(PROG) $(SCRIPTS) $(dest)$(bindir)
|
$(INSTALL) $(PROG) $(SCRIPTS) $(DESTDIR)$(bindir)
|
||||||
$(MAKE) -C templates install
|
$(MAKE) -C templates install
|
||||||
|
|
||||||
install-tools:
|
install-tools:
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
INSTALL=install
|
INSTALL=install
|
||||||
prefix=$(HOME)
|
prefix=$(HOME)
|
||||||
template_dir=$(prefix)/share/git-core/templates/
|
template_dir=$(prefix)/share/git-core/templates/
|
||||||
# dest=
|
# DESTDIR=
|
||||||
|
|
||||||
all: boilerplates custom
|
all: boilerplates custom
|
||||||
find blt
|
find blt
|
||||||
|
@ -34,5 +34,5 @@ clean:
|
||||||
rm -rf blt
|
rm -rf blt
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
$(INSTALL) -d -m755 $(dest)$(template_dir)
|
$(INSTALL) -d -m755 $(DESTDIR)$(template_dir)
|
||||||
tar Ccf blt - . | tar Cxf $(dest)$(template_dir) -
|
tar Ccf blt - . | tar Cxf $(DESTDIR)$(template_dir) -
|
||||||
|
|
|
@ -7,7 +7,7 @@ ALL_CFLAGS = $(CFLAGS)
|
||||||
INSTALL=install
|
INSTALL=install
|
||||||
prefix=$(HOME)
|
prefix=$(HOME)
|
||||||
bindir=$(prefix)/bin
|
bindir=$(prefix)/bin
|
||||||
# dest=
|
# DESTDIR=
|
||||||
|
|
||||||
PROGRAMS=git-mailsplit git-mailinfo
|
PROGRAMS=git-mailsplit git-mailinfo
|
||||||
SCRIPTS=git-applymbox git-applypatch
|
SCRIPTS=git-applymbox git-applypatch
|
||||||
|
@ -19,7 +19,7 @@ all: $(PROGRAMS)
|
||||||
|
|
||||||
install: $(PROGRAMS) $(SCRIPTS)
|
install: $(PROGRAMS) $(SCRIPTS)
|
||||||
$(INSTALL) -m755 -d $(dest)$(bindir)
|
$(INSTALL) -m755 -d $(dest)$(bindir)
|
||||||
$(INSTALL) $(PROGRAMS) $(SCRIPTS) $(dest)$(bindir)
|
$(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(PROGRAMS) *.o
|
rm -f $(PROGRAMS) *.o
|
||||||
|
|
Loading…
Reference in a new issue