X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=templates%2FMakefile;h=9e1ae1a4e0322a37b494177474a964caf05ca4dd;hb=e27e609bbf81271318d99f2643f378f3fde6c6c6;hp=776e6c80097ff5e56659b36c8bf22194c8b9dace;hpb=51017101c7a308745ba3c04944457f1dc6a55780;p=git.git

diff --git a/templates/Makefile b/templates/Makefile
index 776e6c800..9e1ae1a4e 100644
--- 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/
+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 accomodate 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 $(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 -)