kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2018-03-06 14:54:04 -08:00
parent 60f8b89518 2530afd351
commit f655707194
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -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 -)