Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

…ther to

rebuild helpfiles
  • Loading branch information...
commit 7b0ea6e00d2ba07e74bda330658ee31c0622d848 1 parent 9503b16
@bartschaefer bartschaefer authored
View
6 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,
View
1  Config/defs.mk.in
@@ -52,6 +52,7 @@ scriptdir = @scriptdir@
sitescriptdir = @sitescriptdir@
htmldir = @htmldir@
runhelpdir = @runhelpdir@
+runhelp = @runhelp@
# compilation
CC = @CC@
View
15 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); \
View
6 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
Please sign in to comment.
Something went wrong with that request. Please try again.