diff options
| author | Martin Vaeth <vaeth@mathematik.uni-wuerzburg.de> | 2013-11-12 17:41:40 +0000 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2013-11-12 20:57:45 +0000 |
| commit | 0640886d99a48d50fdf3b3e33b5a62c431454dd4 (patch) | |
| tree | 04677a7bda7adfc3c9b298f1247c7a6ed755cb49 /Doc | |
| parent | 2fc2bb7c17aeb7514e5d42e46bb08304480bf125 (diff) | |
| download | zsh-0640886d99a48d50fdf3b3e33b5a62c431454dd4.tar.gz zsh-0640886d99a48d50fdf3b3e33b5a62c431454dd4.tar.xz zsh-0640886d99a48d50fdf3b3e33b5a62c431454dd4.zip | |
31959 (plus tweak to .gitignore): make help files during installation
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/.cvsignore | 1 | ||||
| -rw-r--r-- | Doc/.distfiles | 1 | ||||
| -rw-r--r-- | Doc/Makefile.in | 37 |
3 files changed, 34 insertions, 5 deletions
diff --git a/Doc/.cvsignore b/Doc/.cvsignore index 0ef3b52f5..606228be7 100644 --- a/Doc/.cvsignore +++ b/Doc/.cvsignore @@ -1,4 +1,5 @@ Makefile +help.txt version.yo zsh*.1 zsh.texi diff --git a/Doc/.distfiles b/Doc/.distfiles index 85dc15781..6c2b2119f 100644 --- a/Doc/.distfiles +++ b/Doc/.distfiles @@ -11,6 +11,7 @@ DISTFILES_SRC=' zshcompctl.1 zshcompsys.1 zshcompwid.1 zshexpn.1 zshmisc.1 zshmodules.1 zshoptions.1 zshparam.1 zshroadmap.1 zshzle.1 zshall.1 zshzftpsys.1 zshcontrib.1 zshtcpsys.1 + help.txt ' DISTFILES_DOC=' diff --git a/Doc/Makefile.in b/Doc/Makefile.in index dacbd5170..0ca13fddd 100644 --- a/Doc/Makefile.in +++ b/Doc/Makefile.in @@ -33,7 +33,9 @@ dir_top = .. VPATH = @srcdir@ sdir = @srcdir@ sdir_top = @top_srcdir@ +runhelpdir = @runhelpdir@ INSTALL = @INSTALL@ +LN_S = @LN_S@ @DEFS_MK@ @@ -82,7 +84,7 @@ Zsh/seealso.yo Zsh/tcpsys.yo Zsh/zftpsys.yo Zsh/zle.yo # ========== DEPENDENCIES FOR BUILDING ========== -all: man texi ../META-FAQ +all: man runhelp texi ../META-FAQ .PHONY: all everything: all dvi html pdf info @@ -183,6 +185,14 @@ $(sdir)/zsh.texi: $(YODLSRC) man: $(MAN) .PHONY: man +runhelp: man + test x"$(runhelpdir)" = x"" || { \ + test -r $(sdir)/help.txt && test -r $(sdir)/help/zmodload; \ + } || perl $(sdir_top)/Util/helpfiles $(lc_ctype) -- \ + $(sdir)/zshbuiltins.1 $(sdir)/help $(sdir)/help.txt \ + || { rm -f $(sdir)/help.txt $(sdir)/help/zmodload; false; } +.PHONY: runhelp + $(MAN): zmacros.yo zman.yo zsh.1 zshall.1: Zsh/intro.yo Zsh/metafaq.yo Zsh/invoke.yo Zsh/files.yo \ @@ -285,12 +295,12 @@ Zsh/manmodmenu.yo: $(MODDOCSRC) # ========== DEPENDENCIES FOR INSTALLING ========== -# install just installs the manual pages -install: install.man +# install just installs the manual and runhelp pages +install: install.man install.runhelp .PHONY: install -# uninstall just unistalls the manual pages -uninstall: uninstall.man +# uninstall just uninstalls the manual and runhelp pages +uninstall: uninstall.man uninstall.runhelp .PHONY: uninstall # install man pages, creating install directory if necessary @@ -302,6 +312,18 @@ install.man: man done .PHONY: install.man +# install runhelp pages, creating install directory if necessary +install.runhelp: runhelp + if test x"$(runhelpdir)" != x""; then \ + ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(runhelpdir); \ + $(INSTALL_DATA) $(sdir)/help/* $(DESTDIR)$(runhelpdir); \ + while read from to; do \ + rm -f $(DESTDIR)$(runhelpdir)/$$to || : ; \ + $(LN_S) $$from $(DESTDIR)$(runhelpdir)/$$to; \ + done < $(sdir)/help.txt; \ + fi +.PHONY: install.runhelp + # install info pages, creating install directory if necessary install.info: texi ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir) @@ -334,6 +356,11 @@ uninstall.man: done .PHONY: uninstall.man +# uninstall runhelp pages +uninstall.runhelp: + test x"$(runhelpdir)" = x"" || rm -rf -- $(DESTDIR)$(runhelpdir) +.PHONY: uninstall.runhelp + # uninstall info pages uninstall.info: rm -f $(DESTDIR)$(infodir)/$(tzsh).info |