Merge master changes into release candidate branch.

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