Merge branch 'js/apply'

diff --git a/templates/Makefile b/templates/Makefile
index 6b2a90071bcf1fc8e494b08f3738a34f35bb9cd0..0eeee43feb97ac79406d196c735e4027c4e9cdfd 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -1,17 +1,23 @@
 # make and install sample templates
 
-INSTALL=install
-prefix=$(HOME)
-template_dir=$(prefix)/share/git-core/templates/
-# dest=
+INSTALL ?= install
+TAR ?= tar
+prefix ?= $(HOME)
+template_dir ?= $(prefix)/share/git-core/templates/
+# DESTDIR=
 
-all: boilerplates custom
-       find blt
+# Shell quote (do not use $(call) to accommodate ancient setups);
+DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
+template_dir_SQ = $(subst ','\'',$(template_dir))
+
+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 \
@@ -24,6 +30,7 @@ boilerplates:
                *) cp $$boilerplate blt/$$dst ;; \
                esac || exit; \
        done || exit
+       date >$@
 
 # If you need build-tailored templates, build them into blt/
 # directory yourself here.
@@ -31,8 +38,9 @@ custom:
        : no custom templates yet
 
 clean:
-       rm -rf blt
+       rm -rf blt boilerplates.made
 
 install: all
-       $(INSTALL) -d -m755 $(dest)$(template_dir)
-       tar Ccf blt - . | tar Cxf $(dest)$(template_dir) -
+       $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(template_dir_SQ)'
+       (cd blt && $(TAR) cf - .) | \
+       (cd '$(DESTDIR_SQ)$(template_dir_SQ)' && $(TAR) xf -)