merge-recursive: separate out xdl_merge() interface.

diff --git a/templates/Makefile b/templates/Makefile
index 07e928e56dd00678fdbe092b65bd16f7b7edfcc7..b8352e731bf4baffbda780a1420f52ca4670b828 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -1,19 +1,20 @@
 # make and install sample templates
 
+ifndef V
+       QUIET = @
+endif
+
 INSTALL ?= install
 TAR ?= tar
 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 accommodate 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
@@ -21,7 +22,7 @@ all: boilerplates.made custom
 
 bpsrc = $(filter-out %~,$(wildcard *--*))
 boilerplates.made : $(bpsrc)
-       ls *--* 2>/dev/null | \
+       $(QUIET)ls *--* 2>/dev/null | \
        while read boilerplate; \
        do \
                case "$$boilerplate" in *~) continue ;; esac && \
@@ -32,18 +33,18 @@ boilerplates.made : $(bpsrc)
                *--) ;; \
                *) cp $$boilerplate blt/$$dst ;; \
                esac || exit; \
-       done || exit
+       done && \
        date >$@
 
 # If you need build-tailored templates, build them into blt/
 # directory yourself here.
 custom:
-       : no custom templates yet
+       $(QUIET): no custom templates yet
 
 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 -)