Index: Doc/Makefile.in.orig =================================================================== --- /dev/null +++ Doc/Makefile.in.orig @@ -0,0 +1,351 @@ +# +# Makefile for Doc subdirectory +# +# Copyright (c) 1995-1997 Richard Coleman +# All rights reserved. +# +# Permission is hereby granted, without written agreement and without +# license or royalty fees, to use, copy, modify, and distribute this +# software and to distribute modified versions of this software for any +# purpose, provided that the above copyright notice and the following +# two paragraphs appear in all copies of this software. +# +# In no event shall Richard Coleman or the Zsh Development Group be liable +# to any party for direct, indirect, special, incidental, or consequential +# damages arising out of the use of this software and its documentation, +# even if Richard Coleman and the Zsh Development Group have been advised of +# the possibility of such damage. +# +# Richard Coleman and the Zsh Development Group specifically disclaim any +# warranties, including, but not limited to, the implied warranties of +# merchantability and fitness for a particular purpose. The software +# provided hereunder is on an "as is" basis, and Richard Coleman and the +# Zsh Development Group have no obligation to provide maintenance, +# support, updates, enhancements, or modifications. +# + +subdir = Doc +dir_top = .. + +@VERSION_MK@ + +# source/build directories +VPATH = @srcdir@ +sdir = @srcdir@ +sdir_top = @top_srcdir@ +INSTALL = @INSTALL@ + +@DEFS_MK@ + +MAKEINFO = makeinfo +TEXI2DVI = texi2dvi +DVIPS = dvips +TEXI2HTML = texi2html --output . --ifinfo --split=chapter + +.SUFFIXES: .yo .1 + +# man pages to install +MAN = zsh.1 zshbuiltins.1 zshcompctl.1 zshcompwid.1 zshcompsys.1 \ +zshcontrib.1 zshexpn.1 zshmisc.1 zshmodules.1 \ +zshoptions.1 zshparam.1 zshroadmap.1 zshtcpsys.1 zshzftpsys.1 zshzle.1 \ +zshall.1 + +# yodl documentation + +YODLDOC = $(MAN) texi + +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_datetime.yo Zsh/mod_deltochar.yo \ +Zsh/mod_example.yo Zsh/mod_files.yo \ +Zsh/mod_mapfile.yo Zsh/mod_mathfunc.yo Zsh/mod_newuser.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/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/tcpsys.yo Zsh/zftpsys.yo Zsh/zle.yo + +# ========== DEPENDENCIES FOR BUILDING ========== + +all: man texi ../META-FAQ +.PHONY: all + +everything: all dvi html pdf +.PHONY: everything + +dvi: zsh.dvi +.PHONY: dvi + +zsh.dvi: $(sdir)/zsh.texi + $(TEXI2DVI) $(sdir)/zsh.texi + +pdf: zsh.pdf +.PHONY: pdf + +zsh.pdf: $(sdir)/zsh.texi + PDFTEX=$(PDFETEX) $(TEXI2DVI) --pdf $(sdir)/zsh.texi + +texi: $(sdir)/zsh.texi +.PHONY: texi + +$(sdir)/zsh.texi: + $(YODL) -o $@ -I$(sdir) -w ztexi.yo version.yo zsh.yo; \ + test -f $@ + +info: zsh.info +.PHONY: info + +zsh.info: $(sdir)/zsh.texi + $(MAKEINFO) $(sdir)/zsh.texi + +.yo.1: + @case $@ in \ + */*) target=$@ ;; \ + *) target=$(sdir)/$@ ;; \ + esac; \ + 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' -e 's/\(\\fB\)*'\''/\1\\\&'\''/' > $$target \ + ;; esac; \ + +# These targets are no longer made by default, nor +# distributed with the -doc.tar.gz, since the PDF +# output is generally better. However, they still work. +ps: us_ps a4_ps +.PHONY: ps + +us_ps: zsh_us.ps +.PHONY: us_ps + +zsh_us.ps: zsh.dvi + $(DVIPS) -t letter -o $@ zsh.dvi + +a4_ps: zsh_a4.ps +.PHONY: a4_ps + +zsh_a4.ps: zsh.dvi + $(DVIPS) -t a4 -o $@ zsh.dvi + +html: zsh_toc.html +.PHONY: html + +zsh_toc.html: $(sdir)/zsh.texi + $(TEXI2HTML) $(sdir)/zsh.texi + +zshall.1: zsh.yo + @case $@ in \ + */*) target=$@ ;; \ + *) target=$(sdir)/$@ ;; \ + esac; \ + 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; \ + +../META-FAQ: META-FAQ.yo Zsh/metafaq.yo + 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 + +$(YODLDOC): version.yo + +$(sdir)/zsh.texi: $(YODLSRC) + +man: $(MAN) +.PHONY: man + +$(MAN): zmacros.yo zman.yo + +zsh.1 zshall.1: Zsh/intro.yo Zsh/metafaq.yo Zsh/invoke.yo Zsh/files.yo \ + Zsh/filelist.yo Zsh/filelist.yo Zsh/seealso.yo + +zshbuiltins.1: Zsh/builtins.yo + +zshcompctl.1: Zsh/compctl.yo + +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 \ + Zsh/jobs.yo Zsh/arith.yo Zsh/cond.yo Zsh/compat.yo \ + Zsh/prompt.yo Zsh/restricted.yo + +zshmodules.1: Zsh/modules.yo Zsh/modlist.yo Zsh/modmenu.yo $(MODDOCSRC) + +zshoptions.1: Zsh/options.yo + +zshparam.1: Zsh/params.yo + +zshroadmap.1: Zsh/roadmap.yo + +zshtcpsys.1: Zsh/tcpsys.yo + +zshzftpsys.1: Zsh/zftpsys.yo + +zshzle.1: Zsh/zle.yo + +version.yo: $(sdir_top)/Config/version.mk + ( \ + echo 'STARTDEF()'; \ + echo 'def(version)(0)('$(VERSION)')'; \ + echo 'def(date)(0)('$(VERSION_DATE)')'; \ + echo 'ENDDEF()#' | tr '#' '\\'; \ + ) > $(sdir)/version.yo + +Zsh/modlist.yo: $(MODDOCSRC) + ( \ + echo "startitem()"; \ + for modfile in $(MODDOCSRC); do \ + sed -n -e '1{s|^COMMENT(!MOD!\(.*\)$$|item(tt(\1))(|;p;d;}' \ + -e '/^!MOD!)$$/q;p' \ + < $(sdir)/$$modfile; \ + echo ")"; \ + done; \ + echo "enditem()"; \ + echo "includefile(Zsh/modmenu.yo)"; \ + set '' $(MODDOCSRC); \ + mod1= mod2= mod3=; \ + test ".$$2" = . || \ + mod2=`sed -n '1{s|^COMMENT(!MOD!||;p;q;}' < $(sdir)/$$2`; \ + while test ".$$2" != .; do \ + mod3=; \ + test ".$$3" = . || \ + mod3=`sed -n '1{s|^COMMENT(!MOD!||;p;q;}' < $(sdir)/$$3`; \ + echo "texinode(The $$mod2 Module)($${mod3:+The $$mod3 Module})($${mod1:+The $$mod1 Module})(Zsh Modules)"; \ + echo "sect(The $$mod2 Module)"; \ + echo "includefile($${2})"; \ + shift; \ + mod1=$$mod2; \ + mod2=$$mod3; \ + done \ + ) > $(sdir)/Zsh/modlist.yo + +Zsh/modmenu.yo: $(MODDOCSRC) + ( \ + echo "startmenu()"; \ + for modfile in $(MODDOCSRC); do \ + sed -n '1{s|^COMMENT(!MOD!\(.*\)$$|menu(The \1 Module)|;p;q;}' \ + < $(sdir)/$$modfile; \ + done; \ + echo "endmenu()" \ + ) > $(sdir)/Zsh/modmenu.yo + +Zsh/manmodmenu.yo: $(MODDOCSRC) + ( \ + for modfile in $(MODDOCSRC); do \ + sed -n '1{s|^COMMENT(!MOD!\(.*\)$$|menu(The \1 Module)|;p;q;}' \ + < $(sdir)/$$modfile; \ + done \ + ) > $(sdir)/Zsh/manmodmenu.yo + +# ========== DEPENDENCIES FOR INSTALLING ========== + +# install just installs the manual pages +install: install.man +.PHONY: install + +# uninstall just unistalls the manual pages +uninstall: uninstall.man +.PHONY: uninstall + +# install man pages, creating install directory if necessary +install.man: man + ${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 +.PHONY: install.man + +# install info pages, creating install directory if necessary +install.info: texi + ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir) + rm -rf infodir + mkdir infodir + if ( \ + sed '/^@setfilename/s|zsh|$(tzsh)|' \ + < $(sdir)/zsh.texi > infodir/tzsh.texi && \ + (cd infodir && $(MAKEINFO) tzsh.texi) && \ + for file in infodir/$(tzsh).info*; do \ + $(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 \ + rm -rf infodir; \ + exit 1; \ + fi +.PHONY: install.info + +# uninstall man pages +uninstall.man: + for file in $(MAN); do \ + rm -f $(DESTDIR)$(mandir)/man1/`echo $$file | sed 's|zsh|$(tzsh)|'`; \ + done +.PHONY: uninstall.man + +# uninstall info pages +uninstall.info: + rm -f $(DESTDIR)$(infodir)/$(tzsh).info + rm -f $(DESTDIR)$(infodir)/$(tzsh).info-[1-9]* +.PHONY: uninstall.info + +# install HTML manual +install.html: html + ${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 +.PHONY: uninstall.html + +# ========== DEPENDENCIES FOR CLEANUP ========== + +clean-here: + rm -f *.html *.info* *.dvi *.ps *.pdf + rm -f *.aux *.cp *.cps *.fn *.fns *.ky *.log + rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs + rm -rf infodir +.PHONY: clean-here + +distclean-here: clean-here + rm -f Makefile +.PHONY: distclean-here + +realclean-here: distclean-here + cd $(sdir) && rm -f Zsh/modlist.yo Zsh/modmenu.yo Zsh/manmodmenu.yo + cd $(sdir) && rm -f version.yo ../META-FAQ zsh.texi $(MAN) +.PHONY: realclean-here + +@CLEAN_MK@ + +# ========== DEPENDENCIES FOR MAINTENANCE ========== + +@CONFIG_MK@ Index: Doc/Makefile.in =================================================================== --- Doc/Makefile.in.orig +++ Doc/Makefile.in @@ -276,28 +276,11 @@ install.man: man .PHONY: install.man # install info pages, creating install directory if necessary -install.info: texi +install.info: info ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir) - rm -rf infodir - mkdir infodir - if ( \ - sed '/^@setfilename/s|zsh|$(tzsh)|' \ - < $(sdir)/zsh.texi > infodir/tzsh.texi && \ - (cd infodir && $(MAKEINFO) tzsh.texi) && \ - for file in infodir/$(tzsh).info*; do \ + for file in zsh.info*; do \ $(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 \ - rm -rf infodir; \ - exit 1; \ - fi + done .PHONY: install.info # uninstall man pages @@ -316,7 +299,7 @@ uninstall.info: # install HTML manual install.html: html ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir) - for file in zsh*.html; do \ + for file in zsh/zsh*.html; do \ $(INSTALL_DATA) $$file $(DESTDIR)$(htmldir) || exit 1; \ done .PHONY: install.html Index: Doc/intro.ms =================================================================== --- Doc/intro.ms.orig +++ Doc/intro.ms @@ -336,7 +336,7 @@ functions. For example: >\0\0\0\0\0\0\0ypmatch\0$1\0passwd.byname >\0} %\0yp\0pfalstad -pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/princeton/bin/zsh +pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/bin/zsh .De This function looks up a user in the NIS password map. The \fC$1\fP expands to the first argument to \fCyp\fP. @@ -356,7 +356,7 @@ parsed, not when the function is execute .Ds %\0alias\0ypmatch=echo %\0yp\0pfalstad -pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/princeton/bin/zsh +pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/bin/zsh .De Since the alias was defined after the function was parsed, it has no effect on the function's execution. @@ -379,9 +379,9 @@ We can make the function take multiple a >\0\0\0\0\0\0\0done >\0} %\0yp\0pfalstad\0subbarao\0sukthnkr -pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/princeton/bin/zsh -subbarao:*:3338:35:Kartik\0Subbarao:/u/subbarao:/usr/princeton/bin/zsh -sukthnkr:*:1267:35:Rahul\0Sukthankar:/u/sukthnkr:/usr/princeton/bin/tcsh +pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/bin/zsh +subbarao:*:3338:35:Kartik\0Subbarao:/u/subbarao:/usr/bin/zsh +sukthnkr:*:1267:35:Rahul\0Sukthankar:/u/sukthnkr:/usr/bin/tcsh .De The \fCfor i\fP loops through each of the function's arguments, setting \fCi\fP equal to each of them in turn. @@ -396,8 +396,8 @@ if no arguments are given: %\0yp usage:\0yp\0name\0... %\0yp\0pfalstad\0sukthnkr -pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/princeton/bin/zsh -sukthnkr:*:1267:35:Rahul\0Sukthankar:/u/sukthnkr:/usr/princeton/bin/tcsh +pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/bin/zsh +sukthnkr:*:1267:35:Rahul\0Sukthankar:/u/sukthnkr:/usr/bin/tcsh .De \fC$#\fP is the number of arguments supplied to the function. If it is equal to zero, we print a usage message; otherwise, @@ -516,16 +516,16 @@ separate process is not created.) %\0ed\0/tmp/funs/yp 25 i -#!\0/usr/local/bin/zsh +#!\0/usr/bin/zsh . w 42 q %\0>!$ +%\0/usr/bin/!:0\0!-2*:s/foo/bar/\0>>!$ .De If you don't want to use this, you can turn it off by typing \fCsetopt nobanghist\fP. If you are afraid of accidentally @@ -1191,9 +1191,9 @@ bar In this example, no event designator was used, which tells \fBzsh\fP to use the previous command. A \fC$\fP specifies the last argument .Ds -%\0mkdir\0/usr/local/lib/emacs/site-lisp/calc +%\0mkdir\0/usr/share/emacs/site-lisp/calc %\0cd\0!:$ -cd\0/usr/local/lib/emacs/site-lisp/calc +cd\0/usr/share/emacs/site-lisp/calc .De If you use more words of the same command, only the first \fC!\fP needs an event designator. @@ -1474,7 +1474,7 @@ the \fCvared\fP command: .Ds %\0vared\0PATH >\0/u/pfalstad/scr:/u/pfalstad/bin/sun4:/u/maruchck/scr:/u/subbarao/bin:/u/maruc -hck/bin:/u/subbarao/scripts:/usr/princeton/bin:/usr/ucb:/usr/bin:/bin:/usr/host +hck/bin:/u/subbarao/scripts:/usr/princeton/bin:/usr/bin/X11:/usr/bin:/bin:/usr/host s:/usr/princeton/bin/X11:/./usr/lang:/./usr/etc:/./etc .De You can now edit the path. When you press return, the contents @@ -2267,9 +2267,9 @@ changes \fBpath\fP as well, and vice ver %\0PATH=/bin:/usr/bin:/tmp:. %\0echo\0$path /bin\0/usr/bin\0/tmp\0. -%\0path=(\0/usr/bin\0.\0/usr/local/bin\0/usr/ucb\0) +%\0path=(\0/usr/bin\0.\0/usr/local/bin\0/usr/bin/X11\0) %\0echo\0$PATH -/usr/bin:.:/usr/local/bin:/usr/ucb +/usr/bin:.:/usr/local/bin:/usr/bin/X11 .De The same is true of \fBCDPATH\fP and \fBcdpath\fP: .Ds Index: Functions/Misc/checkmail =================================================================== --- Functions/Misc/checkmail.orig +++ Functions/Misc/checkmail @@ -1,4 +1,4 @@ -#! /usr/local/bin/zsh +#! /usr/bin/zsh # # This autoloadable function checks the folders specified as arguments # for new mails. The arguments are interpreted in exactly the same way Index: Functions/Misc/run-help =================================================================== --- Functions/Misc/run-help.orig +++ Functions/Misc/run-help @@ -1,4 +1,4 @@ -#!/usr/local/bin/zsh +#!/usr/bin/zsh # # Figure out where to get the best help, and get it. # @@ -11,24 +11,26 @@ emulate -R zsh setopt localoptions +: ${ZHELPDIR:=/usr/share/zsh/help} + [[ $1 == "." ]] && 1="dot" [[ $1 == ":" ]] && 1="colon" # Check whether Util/helpfiles has been used to generate zsh help if [[ $# == 0 || $1 == "-l" ]] then - if [[ -n "${HELPDIR:-}" && -d $HELPDIR ]] + if [[ -n "${ZHELPDIR:-}" && -d $ZHELPDIR ]] then echo "Here is a list of topics for which special help is available:" echo "" - print -rc $HELPDIR/*(:t) + print -rc $ZHELPDIR/*(:t) else echo "There is no list of special help topics available at this time." fi return 0 -elif [[ -n "${HELPDIR:-}" && -r $HELPDIR/$1 && $1 != compctl ]] +elif [[ -n "${ZHELPDIR:-}" && -r $ZHELPDIR/$1 && $1 != compctl ]] then - ${=PAGER:-more} $HELPDIR/$1 + ${=PAGER:-less -M} +/^$1 $ZHELPDIR/$1 return $? fi @@ -58,7 +60,7 @@ do case ${what[(w)1]} in (comp*) man zshcompsys;; (zf*) man zshftpsys;; - (*) builtin functions ${what[(w)1]} | ${=PAGER:-more};; + (*) builtin functions ${what[(w)1]} | ${=PAGER:-less -M};; esac;; (*( is a * builtin)) case ${what[(w)1]} in Index: Misc/globtests =================================================================== --- Misc/globtests.orig +++ Misc/globtests @@ -1,4 +1,4 @@ -#!/usr/local/bin/zsh -f +#!/usr/bin/zsh -f setopt extendedglob badpattern unsetopt kshglob Index: Misc/globtests.ksh =================================================================== --- Misc/globtests.ksh.orig +++ Misc/globtests.ksh @@ -1,4 +1,4 @@ -#!/usr/local/bin/zsh -f +#!/usr/bin/zsh -f setopt kshglob extendedglob Index: Misc/lete2ctl =================================================================== --- Misc/lete2ctl.orig +++ Misc/lete2ctl @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl -w # # ``Wee have also Shelles, thee Lyke of whych you knowe not, wherein # thee User may with thee merest Presse of thee Tabbe-Keye expande Index: Src/Makefile.in =================================================================== --- Src/Makefile.in.orig +++ Src/Makefile.in @@ -148,14 +148,7 @@ uninstall.bin: uninstall.bin-here # install binary, creating install directory if necessary install.bin-here: zsh$(EXEEXT) $(INSTLIB) ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) $(STRIPFLAGS) zsh$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION)$(EXEEXT) - if test -f $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT); then \ - rm -f $(DESTDIR)$(bindir)/$(tzsh).old; \ - $(LN) $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh).old; \ - else :; fi - rm -f $(DESTDIR)$(bindir)/$(tzsh).new - $(LN) $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION)$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh).new - mv $(DESTDIR)$(bindir)/$(tzsh).new $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT) + $(INSTALL_PROGRAM) $(STRIPFLAGS) zsh $(DESTDIR)$(bindir)/zsh .PHONY: install.bin-here install.bin-N: Index: Src/Modules/terminfo.c =================================================================== --- Src/Modules/terminfo.c.orig +++ Src/Modules/terminfo.c @@ -28,6 +28,7 @@ */ #define USES_TERM_H 1 +#include #include "terminfo.mdh" #if defined(HAVE_TIGETFLAG) && defined(HAVE_CURSES_H) Index: Src/init.c =================================================================== --- Src/init.c.orig +++ Src/init.c @@ -717,7 +717,7 @@ setupvals(void) path = (char **) zalloc(sizeof(*path) * 5); path[0] = ztrdup("/bin"); path[1] = ztrdup("/usr/bin"); - path[2] = ztrdup("/usr/ucb"); + path[2] = ztrdup("/usr/bin/X11"); path[3] = ztrdup("/usr/local/bin"); path[4] = NULL; Index: Test/ztst.zsh =================================================================== --- Test/ztst.zsh.orig +++ Test/ztst.zsh @@ -1,4 +1,4 @@ -#!/usr/local/bin/zsh -f +#!/usr/bin/zsh -f # The line above is just for convenience. Normally tests will be run using # a specified version of zsh. With dynamic loading, any required libraries # must already have been installed in that case. Index: Util/check_exports =================================================================== --- Util/check_exports.orig +++ Util/check_exports @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl -w # Attempt to scan executable, libraries, and .export files after # a zsh build to see if all necessary symbols appear in the .export file Index: Util/helpfiles =================================================================== --- Util/helpfiles.orig +++ Util/helpfiles @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -- -*-perl-*- +#!/usr/bin/perl -- -*-perl-*- # helpfiles: make help files for Z-shell builtins from the manual entries. Index: Util/reporter =================================================================== --- Util/reporter.orig +++ Util/reporter @@ -1,4 +1,4 @@ -#!/usr/local/bin/zsh +#!/usr/bin/zsh # # NAME: # reporter