diff options
| author | Gerrit Pape <pape@smarden.org> | 2008-02-28 18:44:42 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-28 13:36:50 -0800 |
| commit | 9907721501e19758e64bcce6d3b140316c9307b9 (patch) | |
| tree | c1cbe18c669b4b07e80b56ff8005c1eaddb25f58 | |
| parent | a6f13ccf2460a7905e223cd40ff06631294a4189 (diff) | |
| download | git-9907721501e19758e64bcce6d3b140316c9307b9.tar.gz | |
templates/Makefile: don't depend on local umask setting
Don't take the local umask setting into account when installing the
templates/* files and directories, running 'make install' with umask set
to 077 resulted in template/* installed with permissions 700 and 600.
The problem was discovered by Florian Zumbiehl, reported through
http://bugs.debian.org/467518
Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | templates/Makefile | 6 |
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 -) |