Merge branch 'jn/shell-disable-interactive'

diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 05cdd5c9b2fe5210b9780d394b319ddf289a9eeb..b50750565ff0499dcbdf2f2b9802f109a830d797 100644 (file)
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -30,12 +30,13 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH)
 doc: $(GIT_SUBTREE_DOC)
 
 install: $(GIT_SUBTREE)
-       $(INSTALL) -m 755 $(GIT_SUBTREE) $(libexecdir)
+       $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(libexecdir)
 
 install-doc: install-man
 
 install-man: $(GIT_SUBTREE_DOC)
-       $(INSTALL) -m 644 $^ $(man1dir)
+       $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
+       $(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir)
 
 $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
        xmlto -m $(MANPAGE_NORMAL_XSL)  man $^