diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-06 14:54:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-06 14:54:04 -0800 |
| commit | f65570719458833c20dfdee760bceee069c09056 (patch) | |
| tree | 6cf840ea436b66998840f1b53b9c9ce79661e1f1 /Makefile | |
| parent | 60f8b895180409303e11fa09c1405865365a70be (diff) | |
| parent | 2530afd3519a34b66e72cc29e7751d650cedc6dd (diff) | |
| download | git-f65570719458833c20dfdee760bceee069c09056.tar.gz | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -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 -) |