Merge branch 'maint'

[git.git] / templates / Makefile

diff --git a/templates/Makefile b/templates/Makefile
index 776e6c80097ff5e56659b36c8bf22194c8b9dace..b8352e731bf4baffbda780a1420f52ca4670b828 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -1,18 +1,28 @@
 # make and install sample templates
 
-INSTALL=install
-prefix=$(HOME)
-template_dir=$(prefix)/share/git-core/templates/
+ifndef V
+       QUIET = @
+endif
+
+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:
-       ls *--* 2>/dev/null | \
+
+bpsrc = $(filter-out %~,$(wildcard *--*))
+boilerplates.made : $(bpsrc)
+       $(QUIET)ls *--* 2>/dev/null | \
        while read boilerplate; \
        do \
                case "$$boilerplate" in *~) continue ;; esac && \
@@ -23,16 +33,18 @@ boilerplates:
                *--) ;; \
                *) 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
+       rm -rf blt boilerplates.made
 
 install: all
-       $(INSTALL) -d -m755 $(DESTDIR)$(template_dir)
-       tar Ccf blt - . | tar Cxf $(DESTDIR)$(template_dir) -
+       $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(template_dir_SQ)'
+       (cd blt && $(TAR) cf - .) | \
+       (cd '$(DESTDIR_SQ)$(template_dir_SQ)' && $(TAR) xf -)