Merge branch 'eb/apply' into next

diff --git a/templates/Makefile b/templates/Makefile
index c23aee866d3eca13abd5586ee06bac6e2ab87dc7..8f7f4fec34ad76b85d61f20821f18a1d3ca9a3b2 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -6,8 +6,13 @@ prefix ?= $(HOME)
 template_dir ?= $(prefix)/share/git-core/templates/
 # DESTDIR=
 
+# Shell quote;
+# Result of this needs to be placed inside ''
+shq = $(subst ','\'',$(1))
+# This has surrounding ''
+shellquote = '$(call shq,$(1))'
+
 all: boilerplates.made custom
-       find blt
 
 # Put templates that can be copied straight from the source
 # in a file direc--tory--file in the source.  They will be
@@ -38,6 +43,6 @@ clean:
        rm -rf blt boilerplates.made
 
 install: all
-       $(INSTALL) -d -m755 $(DESTDIR)$(template_dir)
+       $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(template_dir))
        (cd blt && $(TAR) cf - .) | \
-       (cd $(DESTDIR)$(template_dir) && $(TAR) xf -)
+       (cd $(call shellquote,$(DESTDIR)$(template_dir)) && $(TAR) xf -)