pretty: --format output should honor logOutputEncoding

diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index c80260e4d18c7a1a24931826b27538387f71e309..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 $^
@@ -45,7 +46,7 @@ $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
                -agit_version=$(gitver) $^
 
 test:
-       ./test.sh
+       $(MAKE) -C t/ test
 
 clean:
        rm -f *~ *.xml *.html *.1