summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-29 00:00:09 -0800
committerJunio C Hamano <gitster@pobox.com>2008-02-29 00:00:09 -0800
commit25c4f61c51a91051dcba3b8bbbac4c61aa69cc19 (patch)
tree3c5dfb372ebed51da95d0a096143c63e6c277a26 /templates
parent42be5cc61202014d4f1df61f9791067191f9393d (diff)
parent9907721501e19758e64bcce6d3b140316c9307b9 (diff)
downloadgit-25c4f61c51a91051dcba3b8bbbac4c61aa69cc19.tar.gz
Merge branch 'maint'
* maint: templates/Makefile: don't depend on local umask setting Correct name of diff_flush() in API documentation Start preparing for 1.5.4.4 Conflicts: RelNotes
Diffstat (limited to 'templates')
-rw-r--r--templates/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/Makefile b/templates/Makefile
index ebd3a62fd8..bda9d13505 100644
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -29,10 +29,10 @@ boilerplates.made : $(bpsrc)
case "$$boilerplate" in *~) continue ;; esac && \
dst=`echo "$$boilerplate" | sed -e 's|^this|.|;s|--|/|g'` && \
dir=`expr "$$dst" : '\(.*\)/'` && \
- mkdir -p blt/$$dir && \
+ $(INSTALL) -d -m 755 blt/$$dir && \
case "$$boilerplate" in \
*--) ;; \
- *) cp $$boilerplate blt/$$dst ;; \
+ *) cp -p $$boilerplate blt/$$dst ;; \
esac || exit; \
done && \
date >$@
@@ -48,4 +48,4 @@ clean:
install: all
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(template_dir_SQ)'
(cd blt && $(TAR) cf - .) | \
- (cd '$(DESTDIR_SQ)$(template_dir_SQ)' && $(TAR) xf -)
+ (cd '$(DESTDIR_SQ)$(template_dir_SQ)' && umask 022 && $(TAR) xf -)