Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git

diff --git a/tools/Makefile b/tools/Makefile
index 480ce4aad33af9abab66e9b7edfe693772ed9c4b..5cc6d14ebc8d0bf7d91157ed57da6399fe30511a 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
@@ -18,8 +18,8 @@ git-%: %.c
 all: $(PROGRAMS)
 
 install: $(PROGRAMS) $(SCRIPTS)
-       $(INSTALL) -m755 -d $(dest)$(bindir)
-       $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(dest)$(bindir)
+       $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
+       $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir)
 
 clean:
        rm -f $(PROGRAMS) *.o