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

diff --git a/templates/Makefile b/templates/Makefile
index aaa39d30fa57c21f15b5308f8d51de5c2e9d59c0..0722a926f71fb91a03a916e02fea456e8cc0086d 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -6,13 +6,14 @@ 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 accommodate ancient setups);
 DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
-template_dir_SQ = $(subst ','\'',$(template_dir))
+template_instdir_SQ = $(subst ','\'',$(template_instdir))
 
 all: boilerplates.made custom
 
@@ -22,7 +23,7 @@ all: boilerplates.made custom
 
 bpsrc = $(filter-out %~,$(wildcard *--*))
 boilerplates.made : $(bpsrc)
-       $(QUIET)ls *--* 2>/dev/null | \
+       $(QUIET)umask 022 && ls *--* 2>/dev/null | \
        while read boilerplate; \
        do \
                case "$$boilerplate" in *~) continue ;; esac && \
@@ -31,7 +32,7 @@ boilerplates.made : $(bpsrc)
                mkdir -p blt/$$dir && \
                case "$$boilerplate" in \
                *--) ;; \
-               *) cp $$boilerplate blt/$$dst ;; \
+               *) cp -p $$boilerplate blt/$$dst ;; \
                esac || exit; \
        done && \
        date >$@
@@ -42,9 +43,9 @@ custom:
        $(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 -)