aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-09 12:59:44 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-09 12:59:47 -0700
commit16f5bfcf65b46260f3a4fc66769e8b5cfd18a11a (patch)
tree34790946727e58255d6d1f66357544f87e5da281 /Makefile
parent7f41b6bbe3181dc4d1687db036bf22316997a1bf (diff)
parent53b742522c3ae56726e679b50feede849ec46362 (diff)
downloadgit-16f5bfcf65b46260f3a4fc66769e8b5cfd18a11a.tar.gz
git-16f5bfcf65b46260f3a4fc66769e8b5cfd18a11a.tar.xz
Makefile: fix permissions of mergetools/ checked out with permissive umask
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index cd5888b9a..0d230227c 100644
--- a/Makefile
+++ b/Makefile
@@ -2291,8 +2291,7 @@ install: all
$(INSTALL) $(install_bindir_programs) '$(DESTDIR_SQ)$(bindir_SQ)'
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
- (cd mergetools && $(TAR) cf - .) | \
- (cd '$(DESTDIR_SQ)$(mergetools_instdir_SQ)' && umask 022 && $(TAR) xof -)
+ $(INSTALL) -m 644 mergetools/* '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
ifndef NO_PERL
$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
$(MAKE) -C gitweb install