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

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 4798933a493e56de73dd5ea6b560d2bcc5742843..c887ded6afaaacadf9675610e86e261a6e85d139 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -11,6 +11,7 @@ bin=$(prefix)/bin
 mandir=$(prefix)/man
 man1=$(mandir)/man1
 man7=$(mandir)/man7
 mandir=$(prefix)/man
 man1=$(mandir)/man1
 man7=$(mandir)/man7

+# DESTDIR=

 
 INSTALL=install
 
 
 INSTALL=install
 


@@ -33,9 +34,9 @@ man1: $(DOC_MAN1)
 man7: $(DOC_MAN7)
 
 install:
 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
 
 # 'include' dependencies
 git-diff-%.txt: diff-format.txt diff-options.txt

diff --git a/Makefile b/Makefile
index 3e9b40621d748975f51344d216da7e42c03c6497..2e8ed5af17acb18821410f94c244f9881abf957b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ ALL_CFLAGS = $(CFLAGS) $(DEFINES)
 prefix = $(HOME)
 bindir = $(prefix)/bin
 template_dir = $(prefix)/share/git-core/templates/
 prefix = $(HOME)
 bindir = $(prefix)/bin
 template_dir = $(prefix)/share/git-core/templates/

-# dest=
+# DESTDIR=

 
 CC = gcc
 AR = ar
 
 CC = gcc
 AR = ar


@@ -209,8 +209,8 @@ check:
 ### Installation rules
 
 install: $(PROG) $(SCRIPTS)
 ### 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:
        $(MAKE) -C templates install
 
 install-tools:

diff --git a/templates/Makefile b/templates/Makefile
index 6b2a90071bcf1fc8e494b08f3738a34f35bb9cd0..776e6c80097ff5e56659b36c8bf22194c8b9dace 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -3,7 +3,7 @@
 INSTALL=install
 prefix=$(HOME)
 template_dir=$(prefix)/share/git-core/templates/
 INSTALL=install
 prefix=$(HOME)
 template_dir=$(prefix)/share/git-core/templates/

-# dest=
+# DESTDIR=

 
 all: boilerplates custom
        find blt
 
 all: boilerplates custom
        find blt


@@ -34,5 +34,5 @@ clean:
        rm -rf blt
 
 install: all
        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) -

diff --git a/tools/Makefile b/tools/Makefile
index 480ce4aad33af9abab66e9b7edfe693772ed9c4b..779177c5a990fd71d0cacb86dc95d9034f09bfd3 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -7,7 +7,7 @@ ALL_CFLAGS = $(CFLAGS)
 INSTALL=install
 prefix=$(HOME)
 bindir=$(prefix)/bin
 INSTALL=install
 prefix=$(HOME)
 bindir=$(prefix)/bin

-# dest=
+# DESTDIR=

 
 PROGRAMS=git-mailsplit git-mailinfo
 SCRIPTS=git-applymbox git-applypatch
 
 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)
        $(INSTALL) -m755 -d $(dest)$(bindir)

-       $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(dest)$(bindir)
+       $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir)

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