summaryrefslogtreecommitdiff
path: root/contrib/subtree
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-18 02:07:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-18 02:07:17 (GMT)
commit0df8e6d5a534f2e1d445dd6d5101fe1fd5f9bded (patch)
tree337f97a1fd27f77d0d907a006d9066ee3d513b01 /contrib/subtree
parent744f7c4c314dc0e7816ac05520e8358c8318187a (diff)
downloadgit-0df8e6d5a534f2e1d445dd6d5101fe1fd5f9bded.zip
git-0df8e6d5a534f2e1d445dd6d5101fe1fd5f9bded.tar.gz
git-0df8e6d5a534f2e1d445dd6d5101fe1fd5f9bded.tar.bz2
Revert "subtree: make install targets depend on build targets"
This reverts commit 744f7c4c314dc0e7816ac05520e8358c8318187a. These targets do depend on the fact that each prereq is explicitly listed via their use of $^, which I failed to notice, and broke the build.
Diffstat (limited to 'contrib/subtree')
-rw-r--r--contrib/subtree/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 4a10a02..6906aae 100644
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -69,11 +69,11 @@ install: $(GIT_SUBTREE)
install-doc: install-man install-html
-install-man: man
+install-man: $(GIT_SUBTREE_DOC)
$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
$(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir)
-install-html: html
+install-html: $(GIT_SUBTREE_HTML)
$(INSTALL) -d -m 755 $(DESTDIR)$(htmldir)
$(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)
@@ -98,4 +98,4 @@ clean:
$(RM) $(GIT_SUBTREE)
$(RM) *.xml *.html *.1
-.PHONY: FORCE man html install-man install-html
+.PHONY: FORCE