Merge branch 'fixes'

diff --git a/templates/Makefile b/templates/Makefile
index 776e6c80097ff5e56659b36c8bf22194c8b9dace..221a0860661a3adb43470aa22d30b54601223b3d 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -1,8 +1,9 @@
 # make and install sample templates
 
-INSTALL=install
-prefix=$(HOME)
-template_dir=$(prefix)/share/git-core/templates/
+INSTALL ?= install
+TAR ?= tar
+prefix ?= $(HOME)
+template_dir ?= $(prefix)/share/git-core/templates/
 # DESTDIR=
 
 all: boilerplates custom
@@ -35,4 +36,5 @@ clean:
 
 install: all
        $(INSTALL) -d -m755 $(DESTDIR)$(template_dir)
-       tar Ccf blt - . | tar Cxf $(DESTDIR)$(template_dir) -
+       (cd blt && $(TAR) cf - .) | \
+       (cd $(DESTDIR)$(template_dir) && $(TAR) xf -)