t/t91XX-svn: start removing use of "git-" from these tests

diff --git a/templates/Makefile b/templates/Makefile
index 9e1ae1a4e0322a37b494177474a964caf05ca4dd..0722a926f71fb91a03a916e02fea456e8cc0086d 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -1,14 +1,19 @@
 # make and install sample templates
 
+ifndef V
+       QUIET = @
+endif
+
 INSTALL ?= install
 TAR ?= tar
+RM ?= rm -f
 prefix ?= $(HOME)
-template_dir ?= $(prefix)/share/git-core/templates/
+template_instdir ?= $(prefix)/share/git-core/templates
 # DESTDIR=
 
-# Shell quote (do not use $(call) to accomodate ancient setups);
+# Shell quote (do not use $(call) to accommodate ancient setups);
 DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
-template_dir_SQ = $(subst ','\'',$(template_dir))
+template_instdir_SQ = $(subst ','\'',$(template_instdir))
 
 all: boilerplates.made custom
 
@@ -18,7 +23,7 @@ all: boilerplates.made custom
 
 bpsrc = $(filter-out %~,$(wildcard *--*))
 boilerplates.made : $(bpsrc)
-       ls *--* 2>/dev/null | \
+       $(QUIET)umask 022 && ls *--* 2>/dev/null | \
        while read boilerplate; \
        do \
                case "$$boilerplate" in *~) continue ;; esac && \
@@ -27,20 +32,20 @@ boilerplates.made : $(bpsrc)
                mkdir -p blt/$$dir && \
                case "$$boilerplate" in \
                *--) ;; \
-               *) cp $$boilerplate blt/$$dst ;; \
+               *) cp -p $$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
+       $(RM) -r blt boilerplates.made
 
 install: all
-       $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(template_dir_SQ)'
+       $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(template_instdir_SQ)'
        (cd blt && $(TAR) cf - .) | \
-       (cd '$(DESTDIR_SQ)$(template_dir_SQ)' && $(TAR) xf -)
+       (cd '$(DESTDIR_SQ)$(template_instdir_SQ)' && umask 022 && $(TAR) xfo -)