Merge branch 'bc/reflog-fix' into js/reflog-delete

diff --git a/templates/Makefile b/templates/Makefile
index b8352e731bf4baffbda780a1420f52ca4670b828..ebd3a62fd866453ad77406ec063b923e99ee0990 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -6,8 +6,9 @@ endif
 
 INSTALL ?= install
 TAR ?= tar
+RM ?= rm -f
 prefix ?= $(HOME)
-template_dir ?= $(prefix)/share/git-core/templates/
+template_dir ?= $(prefix)/share/git-core/templates
 # DESTDIR=
 
 # Shell quote (do not use $(call) to accommodate ancient setups);
@@ -42,9 +43,9 @@ custom:
        $(QUIET): no custom templates yet
 
 clean:
-       rm -rf blt boilerplates.made
+       $(RM) -r blt boilerplates.made
 
 install: all
-       $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(template_dir_SQ)'
+       $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(template_dir_SQ)'
        (cd blt && $(TAR) cf - .) | \
        (cd '$(DESTDIR_SQ)$(template_dir_SQ)' && $(TAR) xf -)