merge-recur: do not setenv("GIT_INDEX_FILE")

diff --git a/templates/Makefile b/templates/Makefile
index 221a0860661a3adb43470aa22d30b54601223b3d..8f7f4fec34ad76b85d61f20821f18a1d3ca9a3b2 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -6,13 +6,20 @@ prefix ?= $(HOME)
 template_dir ?= $(prefix)/share/git-core/templates/
 # DESTDIR=
 
-all: boilerplates custom
-       find blt
+# Shell quote;
+# Result of this needs to be placed inside ''
+shq = $(subst ','\'',$(1))
+# This has surrounding ''
+shellquote = '$(call shq,$(1))'
+
+all: boilerplates.made custom
 
 # Put templates that can be copied straight from the source
 # in a file direc--tory--file in the source.  They will be
 # just copied to the destination.
-boilerplates:
+
+bpsrc = $(filter-out %~,$(wildcard *--*))
+boilerplates.made : $(bpsrc)
        ls *--* 2>/dev/null | \
        while read boilerplate; \
        do \
@@ -25,6 +32,7 @@ boilerplates:
                *) cp $$boilerplate blt/$$dst ;; \
                esac || exit; \
        done || exit
+       date >$@
 
 # If you need build-tailored templates, build them into blt/
 # directory yourself here.
@@ -32,9 +40,9 @@ custom:
        : no custom templates yet
 
 clean:
-       rm -rf blt
+       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 -)