summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-12-11 14:12:12 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-12-11 14:12:12 -0800
commit73c7f5ec05428b7da2d1b00a02a3267f1235d8e4 (patch)
tree05cfba64adec1c2c274870ac32280947ebef90ef /Documentation
parentDocumentation: simpler shared repository creation (diff)
parentMake sure the empty tree exists when needed in merge-recursive. (diff)
downloadtgif-73c7f5ec05428b7da2d1b00a02a3267f1235d8e4.tar.xz
Merge branch 'maint'
* maint: Make sure the empty tree exists when needed in merge-recursive. Don't use memcpy when source and dest. buffers may overlap no need to install manpages as executable
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index c00f5f62b7..d68bc4a788 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -56,8 +56,8 @@ man7: $(DOC_MAN7)
install: man
$(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir)
- $(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1dir)
- $(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7dir)
+ $(INSTALL) -m644 $(DOC_MAN1) $(DESTDIR)$(man1dir)
+ $(INSTALL) -m644 $(DOC_MAN7) $(DESTDIR)$(man7dir)
#