Merge branch 'js/filter'

diff --git a/templates/Makefile b/templates/Makefile
index 81bd86ccf3949afe8d2381f4ed2fcceb0439d698..aaa39d30fa57c21f15b5308f8d51de5c2e9d59c0 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -1,13 +1,13 @@
 # make and install sample templates
 
-ifdef QUIET_MAKE
+ifndef V
        QUIET = @
 endif
 
 INSTALL ?= install
 TAR ?= tar
 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);