From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Mar 2018 22:54:04 +0000 (-0800)
Subject: Merge branch 'ab/simplify-perl-makefile'
X-Git-Tag: v2.17.0-rc0~42
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f65570719458833c20dfdee760bceee069c09056?hp=60f8b895180409303e11fa09c1405865365a70be

Merge branch 'ab/simplify-perl-makefile'

Hotfix for a topic already in 'master'.

* ab/simplify-perl-makefile:
Makefile: generate Git(3pm) as dependency of the 'doc' and 'man' targets
---

diff --git a/Makefile b/Makefile
index 5ae9616e0a..de4b8f0c02 100644
--- a/Makefile
+++ b/Makefile
@@ -2218,13 +2218,15 @@ $(VCSSVN_LIB): $(VCSSVN_OBJS)
 
 export DEFAULT_EDITOR DEFAULT_PAGER
 
-.PHONY: doc man html info pdf
-doc:
+.PHONY: doc man man-perl html info pdf
+doc: man-perl
 	$(MAKE) -C Documentation all
 
-man:
+man: man-perl
 	$(MAKE) -C Documentation man
 
+man-perl: perl/build/man/man3/Git.3pm
+
 html:
 	$(MAKE) -C Documentation html
 
@@ -2622,7 +2624,7 @@ endif
 	done && \
 	./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
 
-.PHONY: install-gitweb install-doc install-man install-html install-info install-pdf
+.PHONY: install-gitweb install-doc install-man install-man-perl install-html install-info install-pdf
 .PHONY: quick-install-doc quick-install-man quick-install-html
 install-gitweb:
 	$(MAKE) -C gitweb install
@@ -2633,7 +2635,7 @@ install-doc: install-man-perl
 install-man: install-man-perl
 	$(MAKE) -C Documentation install-man
 
-install-man-perl: perl/build/man/man3/Git.3pm
+install-man-perl: man-perl
 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mandir_SQ)/man3'
 	(cd perl/build/man/man3 && $(TAR) cf - .) | \
 	(cd '$(DESTDIR_SQ)$(mandir_SQ)/man3' && umask 022 && $(TAR) xof -)