Merge branch 'fixes'

diff --git a/templates/Makefile b/templates/Makefile
index 6b2a90071bcf1fc8e494b08f3738a34f35bb9cd0..221a0860661a3adb43470aa22d30b54601223b3d 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -1,9 +1,10 @@
 # make and install sample templates
 
-INSTALL=install
-prefix=$(HOME)
-template_dir=$(prefix)/share/git-core/templates/
-# dest=
+INSTALL ?= install
+TAR ?= tar
+prefix ?= $(HOME)
+template_dir ?= $(prefix)/share/git-core/templates/
+# DESTDIR=
 
 all: boilerplates custom
        find blt
@@ -34,5 +35,6 @@ 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)
+       (cd blt && $(TAR) cf - .) | \
+       (cd $(DESTDIR)$(template_dir) && $(TAR) xf -)