From 040207b7d54480389ba7123c448d531da481c403 Mon Sep 17 00:00:00 2001 From: Bart Schaefer Date: Fri, 6 May 2005 15:19:00 +0000 Subject: 21229: fix build when yodl not found --- Doc/Makefile.in | 61 ++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 24 deletions(-) (limited to 'Doc/Makefile.in') diff --git a/Doc/Makefile.in b/Doc/Makefile.in index e20e50072..6fd2f48a1 100644 --- a/Doc/Makefile.in +++ b/Doc/Makefile.in @@ -39,15 +39,15 @@ INSTALL = @INSTALL@ MAKEINFO = makeinfo TEXI2DVI = texi2dvi -DVIPS = dvips -D 300 -TEXI2HTML = texi2html -expandinfo -split_chapter +DVIPS = dvips +TEXI2HTML = texi2html -expand info -split chapter .SUFFIXES: .yo .1 # man pages to install MAN = zsh.1 zshbuiltins.1 zshcompctl.1 zshcompwid.1 zshcompsys.1 \ -zshexpn.1 zshmisc.1 zshmodules.1 \ -zshoptions.1 zshparam.1 zshzftpsys.1 zshzle.1 zshall.1 +zshcontrib.1 zshexpn.1 zshmisc.1 zshmodules.1 \ +zshoptions.1 zshparam.1 zshtcpsys.1 zshzftpsys.1 zshzle.1 zshall.1 # yodl documentation @@ -57,19 +57,24 @@ MODDOCSRC = \ Zsh/mod_cap.yo Zsh/mod_clone.yo \ Zsh/mod_compctl.yo Zsh/mod_complete.yo Zsh/mod_complist.yo \ Zsh/mod_computil.yo \ -Zsh/mod_deltochar.yo Zsh/mod_example.yo Zsh/mod_files.yo \ -Zsh/mod_mapfile.yo Zsh/mod_mathfunc.yo Zsh/mod_parameter.yo Zsh/mod_sched.yo \ -Zsh/mod_stat.yo Zsh/mod_zftp.yo Zsh/mod_zle.yo Zsh/mod_zleparameter.yo \ -Zsh/mod_zutil.yo Zsh/mod_zprof.yo Zsh/mod_zpty.yo +Zsh/mod_datetime.yo Zsh/mod_deltochar.yo \ +Zsh/mod_example.yo Zsh/mod_files.yo \ +Zsh/mod_mapfile.yo Zsh/mod_mathfunc.yo Zsh/mod_parameter.yo Zsh/mod_pcre.yo \ +Zsh/mod_sched.yo Zsh/mod_socket.yo \ +Zsh/mod_stat.yo Zsh/mod_system.yo Zsh/mod_tcp.yo \ +Zsh/mod_termcap.yo Zsh/mod_terminfo.yo \ +Zsh/mod_zftp.yo Zsh/mod_zle.yo Zsh/mod_zleparameter.yo \ +Zsh/mod_zprof.yo Zsh/mod_zpty.yo Zsh/mod_zselect.yo \ +Zsh/mod_zutil.yo YODLSRC = zmacros.yo zman.yo ztexi.yo Zsh/arith.yo Zsh/builtins.yo \ Zsh/compat.yo Zsh/compctl.yo Zsh/compsys.yo Zsh/compwid.yo Zsh/cond.yo \ -Zsh/exec.yo Zsh/expn.yo \ +Zsh/contrib.yo Zsh/exec.yo Zsh/expn.yo \ Zsh/filelist.yo Zsh/files.yo Zsh/func.yo Zsh/grammar.yo Zsh/manual.yo \ Zsh/index.yo Zsh/intro.yo Zsh/invoke.yo Zsh/jobs.yo Zsh/metafaq.yo \ Zsh/modules.yo Zsh/modlist.yo Zsh/modmenu.yo Zsh/manmodmenu.yo $(MODDOCSRC) \ Zsh/options.yo Zsh/params.yo Zsh/prompt.yo Zsh/redirect.yo Zsh/restricted.yo \ -Zsh/seealso.yo Zsh/zftpsys.yo Zsh/zle.yo +Zsh/seealso.yo Zsh/tcpsys.yo Zsh/zftpsys.yo Zsh/zle.yo # ========== DEPENDENCIES FOR BUILDING ========== @@ -99,14 +104,14 @@ zsh.info: $(sdir)/zsh.texi $(MAKEINFO) $(sdir)/zsh.texi .yo.1: - case $@ in \ + @case $@ in \ */*) target=$@ ;; \ *) target=$(sdir)/$@ ;; \ esac; \ - case '$(YODL)' in :*) ;; *) \ + case '$(YODL)' in :*) touch $$target ;; *) \ + echo $(YODL) -o $$target -I$(sdir) -w zman.yo version.yo $< ; \ $(YODL) -I$(sdir) -w zman.yo version.yo $< | sed -e '1s/\\-/-/g' -e '/^\.'\''/d' > $$target \ ;; esac; \ - test -f $$target ps: us_ps a4_ps .PHONY: ps @@ -130,20 +135,19 @@ zsh_toc.html: $(sdir)/zsh.texi $(TEXI2HTML) $(sdir)/zsh.texi zshall.1: zsh.yo - case $@ in \ + @case $@ in \ */*) target=$@ ;; \ *) target=$(sdir)/$@ ;; \ esac; \ - case '$(YODL)' in :*) ;; *) \ + case '$(YODL)' in :*) touch $$target ;; *) \ + echo $(YODL) -o $$target -I$(sdir) -DZSHALL -w zman.yo version.yo zsh.yo; \ $(YODL) -I$(sdir) -DZSHALL -w zman.yo version.yo zsh.yo | sed -e '1s/\\-/-/g' -e '/^\.'\''/d' > $$target \ ;; esac; \ - test -f $$target ../META-FAQ: META-FAQ.yo Zsh/metafaq.yo - case '$(YODL)' in :*) ;; *) \ + case '$(YODL)' in :*) touch $(sdir_top)/META-FAQ ;; *) \ $(YODL) -I$(sdir) META-FAQ.yo | sed -e '/NEXTLINE/N' -e '/DELLINE/d' -e '/^SECTHEAD$$/{N;s/^SECTHEAD.//;h;s/./-/g;H;g;}' -e 's/ *$$//' > $(sdir_top)/META-FAQ \ ;; esac - test -f $(sdir_top)/META-FAQ $(YODLDOC): version.yo @@ -165,6 +169,8 @@ zshcompwid.1: Zsh/compwid.yo zshcompsys.1: Zsh/compsys.yo +zshcontrib.1: Zsh/contrib.yo + zshexpn.1: Zsh/expn.yo zshmisc.1: Zsh/grammar.yo Zsh/redirect.yo Zsh/exec.yo Zsh/func.yo \ @@ -177,6 +183,8 @@ zshoptions.1: Zsh/options.yo zshparam.1: Zsh/params.yo +zshtcpsys.1: Zsh/tcpsys.yo + zshzftpsys.1: Zsh/zftpsys.yo zshzle.1: Zsh/zle.yo @@ -193,7 +201,8 @@ Zsh/modlist.yo: $(MODDOCSRC) ( \ echo "startitem()"; \ for modfile in $(MODDOCSRC); do \ - sed -n '1{s|^COMMENT(!MOD!\(.*\)$$|item(tt(\1))(|;p;d;};/^!MOD!)$$/q;p' \ + sed -n -e '1{s|^COMMENT(!MOD!\(.*\)$$|item(tt(\1))(|;p;d;}' \ + -e '/^!MOD!)$$/q;p' \ < $(sdir)/$$modfile; \ echo ")"; \ done; \ @@ -246,7 +255,7 @@ uninstall: uninstall.man # install man pages, creating install directory if necessary install.man: man - $(sdir_top)/mkinstalldirs $(DESTDIR)$(mandir)/man1 + ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(mandir)/man1 for file in $(MAN); do \ $(INSTALL_DATA) $(sdir)/$$file $(DESTDIR)$(mandir)/man1/`echo $$file | sed 's|zsh|$(tzsh)|'` || exit 1; \ done @@ -254,7 +263,7 @@ install.man: man # install info pages, creating install directory if necessary install.info: texi - $(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir) + ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir) rm -rf infodir mkdir infodir if ( \ @@ -265,6 +274,10 @@ install.info: texi $(INSTALL_DATA) $$file $(DESTDIR)$(infodir) || exit 1; \ done \ ); then \ + if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ + install-info --dir-file=$(DESTDIR)$(infodir)/dir \ + $(DESTDIR)$(infodir)/$(tzsh).info; \ + else true; fi; \ rm -rf infodir; \ exit 0; \ else \ @@ -288,15 +301,15 @@ uninstall.info: # install HTML manual install.html: html - $(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir) - for file in zsh_*.html; do \ + ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir) + for file in zsh*.html; do \ $(INSTALL_DATA) $$file $(DESTDIR)$(htmldir) || exit 1; \ done .PHONY: install.html # uninstall HTML manual uninstall.html: - rm -f $(DESTDIR)$(htmldir)/zsh_*.html + rm -f $(DESTDIR)$(htmldir)/zsh*.html .PHONY: uninstall.html # ========== DEPENDENCIES FOR CLEANUP ========== -- cgit 1.4.1