diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2013-11-25 00:11:36 -0800 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2013-11-25 00:11:36 -0800 |
| commit | 7b0ea6e00d2ba07e74bda330658ee31c0622d848 (patch) | |
| tree | 3df1fd16e96df4b4d0a6936c87075b37ecd5201c | |
| parent | 9503b161ab893a5d5c6ac6f9fdd9e938aee7045c (diff) | |
| download | zsh-7b0ea6e00d2ba07e74bda330658ee31c0622d848.tar.gz zsh-7b0ea6e00d2ba07e74bda330658ee31c0622d848.tar.xz zsh-7b0ea6e00d2ba07e74bda330658ee31c0622d848.zip | |
32045 (adjusted by 32047): use makefile dependencies to determine whether to
rebuild helpfiles
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Config/defs.mk.in | 1 | ||||
| -rw-r--r-- | Doc/Makefile.in | 15 | ||||
| -rw-r--r-- | configure.ac | 6 |
4 files changed, 21 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index faf75cd88..1e6b624ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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, diff --git a/Config/defs.mk.in b/Config/defs.mk.in index 5c19cc4d5..2c813a3b2 100644 --- a/Config/defs.mk.in +++ b/Config/defs.mk.in @@ -52,6 +52,7 @@ scriptdir = @scriptdir@ sitescriptdir = @sitescriptdir@ htmldir = @htmldir@ runhelpdir = @runhelpdir@ +runhelp = @runhelp@ # compilation CC = @CC@ diff --git a/Doc/Makefile.in b/Doc/Makefile.in index eae330171..50e210fcf 100644 --- a/Doc/Makefile.in +++ b/Doc/Makefile.in @@ -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); \ diff --git a/configure.ac b/configure.ac index 607c61204..776b90828 100644 --- a/configure.ac +++ b/configure.ac @@ -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 |