mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-16 12:21:18 +02:00
Code Releases Activity

32045 (adjusted by 32047): use makefile dependencies to determine whether to

Browse source 
rebuild helpfiles
This commit is contained in:
Barton E. Schaefer 2013-11-25 00:11:36 -08:00
parent 9503b161ab
commit 7b0ea6e00d
4 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-11-25 Barton E. Schaefer <schaefer@zsh.org>
* 32045 (as corrected by Martin Vaeth 32047): Config/defs.mk.in,
Doc/Makefile.in, configure.ac: use dependencies to determine
whether to rebuild helpfiles.
2013-11-23 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 32031 plus missed _run_help: Completion/Zsh/Command/_run-help,

1
Config/defs.mk.in
View file

@ -52,6 +52,7 @@ scriptdir = @scriptdir@
sitescriptdir = @sitescriptdir@
htmldir = @htmldir@
runhelpdir = @runhelpdir@
runhelp = @runhelp@
# compilation
CC = @CC@

15
Doc/Makefile.in
View file

@ -83,7 +83,7 @@ Zsh/seealso.yo Zsh/tcpsys.yo Zsh/zftpsys.yo Zsh/zle.yo
# ========== DEPENDENCIES FOR BUILDING ==========
all: man runhelp texi ../META-FAQ
all: man $(runhelp) texi ../META-FAQ
.PHONY: all
everything: all dvi html pdf info
@ -184,13 +184,14 @@ $(sdir)/zsh.texi: $(YODLSRC)
man: $(MAN)
.PHONY: man
runhelp: man
test x"$(runhelpdir)" = x"" || { \
test -r $(sdir)/help.txt && test -r $(sdir)/help/ztcp; \
} || perl $(sdir_top)/Util/helpfiles \
runhelp: help.txt
.PHONY: runhelp
help.txt: zshbuiltins.1
@-rm -f $(sdir)/help.txt $(sdir)/help/*
perl $(sdir_top)/Util/helpfiles \
$(sdir)/zshbuiltins.1 $(sdir)/help $(sdir)/help.txt \
|| { rm -f $(sdir)/help.txt $(sdir)/help/*; false; }
.PHONY: runhelp
$(MAN): zmacros.yo zman.yo
@ -312,7 +313,7 @@ install.man: man
.PHONY: install.man
# install runhelp pages, creating install directory if necessary
install.runhelp: runhelp
install.runhelp: $(runhelp)
if test x"$(runhelpdir)" != x""; then \
${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(runhelpdir); \
$(INSTALL_DATA) $(sdir)/help/* $(DESTDIR)$(runhelpdir); \

6
configure.ac
View file

@ -269,6 +269,11 @@ fi], [runhelpdir=yes])
if test x"$runhelpdir" = xyes; then
runhelpdir=${datadir}/${tzsh_name}/'${VERSION}'/help
fi
if test x"$runhelpdir" = x; then
runhelp=
else
runhelp=runhelp
fi
ifdef([fndir],[undefine([fndir])])dnl
AC_ARG_ENABLE(fndir,
@ -310,6 +315,7 @@ else
fi], [additionalfpath=""])
AC_SUBST(runhelpdir)dnl
AC_SUBST(runhelp)dnl
AC_SUBST(additionalfpath)dnl
AC_SUBST(fndir)dnl
AC_SUBST(sitefndir)dnl