git-checkout -m: fix merge case

diff --git a/templates/Makefile b/templates/Makefile
index 07e928e56dd00678fdbe092b65bd16f7b7edfcc7..9e1ae1a4e0322a37b494177474a964caf05ca4dd 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -6,14 +6,11 @@ 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))'
+# Shell quote (do not use $(call) to accomodate ancient setups);
+DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
+template_dir_SQ = $(subst ','\'',$(template_dir))
 
 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
@@ -44,6 +41,6 @@ clean:
        rm -rf blt boilerplates.made
 
 install: all
-       $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(template_dir))
+       $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(template_dir_SQ)'
        (cd blt && $(TAR) cf - .) | \
-       (cd $(call shellquote,$(DESTDIR)$(template_dir)) && $(TAR) xf -)
+       (cd '$(DESTDIR_SQ)$(template_dir_SQ)' && $(TAR) xf -)