Update to tcsh 6.18.01.

1 files changed, 202 insertions, 111 deletions

diff --git a/contrib/tcsh/Makefile.in b/contrib/tcsh/Makefile.in
index 784e409..cff1487 100644
--- a/contrib/tcsh/Makefile.in
+++ b/contrib/tcsh/Makefile.in
@@ -1,4 +1,4 @@
-# $tcsh: Makefile.in,v 3.40 2009/06/24 22:09:05 christos Exp $
+# $tcsh: Makefile.in,v 3.49 2011/02/05 17:35:31 christos Exp $
 #	Makefile.in	4.3	6/11/83
 #
 # C Shell with process control; VM/UNIX VAX Makefile
@@ -26,22 +26,27 @@ CF=-c
 CPPFLAGS=-I. -I$(srcdir)
 
 LFLAGS=
-#LFLAGS= -Zn10000		# hpux lint
+# hpux lint
+#LFLAGS= -Zn10000
 
 
-CFLAGS = @CFLAGS@		# This is set by autoconf.
-#CFLAGS= -g			# debug
-#CFLAGS= -O			# production
-#CFLAGS= 			# Broken optimizers....
+# This is set by autoconf:
+CFLAGS = @CFLAGS@
+# debug:
+#CFLAGS= -g
+# production:
+#CFLAGS= -O
+# Broken optimizers....
+#CFLAGS=
 
 #CFLAGS= -g -pg -DPROF
 #CFLAGS= -O -pg -DPROF
 
 # gcc 1.00-1.37
-#CFLAGS= -O -finline-functions -fstrength-reduce 
+#CFLAGS= -O -finline-functions -fstrength-reduce
 
 # gcc 1.37-1.40
-#CFLAGS= -O -fcombine-regs -finline-functions -fstrength-reduce 
+#CFLAGS= -O -fcombine-regs -finline-functions -fstrength-reduce
 # add -msoft-float for 68881 machines.
 
 # gcc 2.0
@@ -67,8 +72,10 @@ CFLAGS = @CFLAGS@		# This is set by autoconf.
 #CFLAGS= -O -Mnodebug -Mnoperfmon
 
 # DEC Alpha OSF/1
-#CFLAGS= -O2 -Olimit 2000	## Normal Optimization
-#CFLAGS= -O3 -Olimit 2000	## Full Optimization - may not work
+## Normal Optimization
+#CFLAGS= -O2 -Olimit 2000
+## Full Optimization - may not work
+#CFLAGS= -O3 -Olimit 2000
 #CF=-j
 #SUF=u
 #.SUFFIXES: .u
@@ -77,7 +84,8 @@ CFLAGS = @CFLAGS@		# This is set by autoconf.
 # global optimizer! (-O3).
 # On SGI 4.0+ you need to add -D__STDC__ too.
 #CFLAGS= -O3
-#CFLAGS= -O3 -Olimit 2000	## Ultrix 4.2a
+## Ultrix 4.2a
+#CFLAGS= -O3 -Olimit 2000
 #CF=-j
 #SUF=u
 #.SUFFIXES: .u 				## Ultrix and gnu-make need that
@@ -110,14 +118,14 @@ CFLAGS = @CFLAGS@		# This is set by autoconf.
 # CFLAGS= -O3
 
 # SINIX RMx00
-#CFLAGS= -O # -D_POSIX_SOURCE # -kansi
+#CFLAGS= -O# -D_POSIX_SOURCE# -kansi
 
 # Apollo's with cc [apollo builtins don't work with gcc]
 # and apollo should not define __STDC__ if it does not have
 # the standard header files. RT's (aos4.3) need that too;
 # you might want to skip the -O on the rt's... Not very wise.
 # AIX/ESA needs -D_IBMESA on command line (this may disappear by GA)
-#DFLAGS=-U__STDC__ 
+#DFLAGS=-U__STDC__
 #DFLAGS=-D_IBMESA
 # On aix2.2.1 we need more compiler space.
 #DFLAGS=-Nd4000 -Nn3000
@@ -142,17 +150,25 @@ DFLAGS = -D_PATH_TCSHELL='"${bindir}/tcsh"' @DFLAGS@ @CPPFLAGS@
 ################################################################
 ## LDFLAGS.  Define something here if you need to
 ################################################################
-LDFLAGS= @LDFLAGS@		## This is set by autoconf.
-#LDFLAGS= 			## The simplest, suitable for all.
-#LDFLAGS= -s			## Stripped. Takes less space on disk.
-#LDFLAGS= -s -n			## Pure executable. Spares paging over
-# 				## the network for machines with local
-#				## swap but external /usr/local/bin .
-#LDFLAGS= -s -n -Bstatic	## Without dynamic linking. (SunOS/cc)
-#LDFLAGS= -s -n -static		## Without dynamic linking. (SunOS/gcc)
-#LDFLAGS= -Wl,-s,-n		## Stripped, shared text (Unicos)
-#LDFLAGS= -s -static		## Link statically. (linux)
-#LDFLAGS= -s -N			## Impure executable (linux)
+## This is set by autoconf:
+LDFLAGS= @LDFLAGS@
+## The simplest, suitable for all.
+#LDFLAGS=
+## Stripped. Takes less space on disk.
+#LDFLAGS= -s
+## Pure executable.  Spares paging over the network for machines with
+## local swap but external /usr/local/bin .
+#LDFLAGS= -s -n
+## Without dynamic linking. (SunOS/cc)
+#LDFLAGS= -s -n -Bstatic
+## Without dynamic linking. (SunOS/gcc)
+#LDFLAGS= -s -n -static
+## Stripped, shared text (Unicos)
+#LDFLAGS= -Wl,-s,-n
+## Link statically. (linux)
+#LDFLAGS= -s -static
+## Impure executable (linux)
+#LDFLAGS= -s -N
 
 ################################################################
 ## SBINLDFLAGS.  Flags to build a tcsh suitable for installation in
@@ -164,53 +180,100 @@ SBINLDFLAGS=-Wl,-R/etc/lib,-I/etc/lib/ld.so.1,-ldl,-Bstatic
 ################################################################
 ## LIBES.  Pick one, or roll your own.
 ################################################################
-LIBES= @LIBS@	 			 ## This is set by autoconf.
-#LIBES= -ltermcap 			 ## BSD style things
-#LIBES= -ltermcap			 ## SunOS, HP-UX, pyramid
-#LIBES= -ltermcap			 ## Linux
-#LIBES= -ltermcap -lshadow		 ## Linux with PW_SHADOW
-#LIBES= -ltermcap -lsec			 ## Tek XD88/10 (UTekV) with PW_SHADOW
-#LIBES= -ltermcap -lsec			 ## Motorola MPC (sysV88) with PW_SHADOW
-#LIBES= -ltermcap -lcs			 ## Mach
-#LIBES= -ltermcap -lbsd			 ## DEC osf1 on the alpha
-#LIBES= -ltermcap -lbsd			 ## Intel paragon
-#LIBES= -ltermcap -lbsd			 ## Clipper intergraph
-#LIBES= -ltermcap -lseq			 ## Sequent's Dynix
-#LIBES= -ltermcap -lauth		 ## Ultrix with Enhanced Security
-#LIBES= -ltermcap -ldir -lx		 ## Xenix 386 style things
-#LIBES= -ltermcap -lndir -lsocket -ljobs ## masscomp RTU6.0
-#LIBES= -lcurses			 ## AIX on the rt
-#LIBES= -lcurses			 ## TitanOS on the stellar
-#LIBES= -ltermlib -lsocket -lnsl	 ## SysV4 w/o BSDTIMES or Solaris 2
-#LIBES= -lcurses			 ## SysV3 w/o networking
-#LIBES= -lcurses -lnet			 ## SysV3 with networking
-#LIBES= -lcurses -ldir			 ## SysV2 w/o networking & dirlib
-#LIBES= -lcurses -ldir -lnet		 ## SysV2 with networking & dirlib
-#LIBES= -lcurses -lbsd			 ## AIX on the IBM 370 or rs6000 or ps2
-#LIBES= -lcurses -lbsd			 ## ETA10
-#LIBES= -lcurses -lbsd			 ## Irix3.1 on the SGI-IRIS4D
-#LIBES= -lcurses -lbsd -lc_s		 ## Irix3.3 on the SGI-IRIS4D w/o yp
-#LIBES= -lcurses -lsun -lbsd -lc_s	 ## Irix3.3 on the SGI-IRIS4D with yp
-#LIBES= -lcurses -lsocket -lbsd		 ## Amdahl UTS 2.1
-#LIBES= -lcurses -lsocket		 ## Intel's hypercube.
-#LIBES= -lcurses -lsocket		 ## ns32000 based Opus.
-#LIBES= -lcurses -lcposix		 ## ISC 2.2 without networking
-#LIBES= -lcposix -lc_s -lcurses -linet	 ## ISC 2.2 with networking
-#LIBES= -lcurses -lsec -lc_s		 ## ISC 2.0.2 without networking
-#LIBES= -lcurses -linet -lsec -lc_s	 ## ISC 2.0.2 with networking
-#LIBES= -lcurses -lintl -lcrypt		 ## SCO SysVR3.2v2.0
-#LIBES= -lcurses -lintl -lsocket -lcrypt ## SCO+ODT1.1
-#LIBES= -lposix -ltermcap		 ## A/UX 2.0
-#LIBES= -lposix -ltermcap -lc_s		 ## A/UX 3.0
-#LIBES= -ldirent -lcurses		 ## att3b1 cc w/o shared lib & dirlib
-#LIBES= -shlib -ldirent -lcurses	 ## att3b1 gcc with shared lib & dirlib
-#LIBES= -ltermlib -lsocket -lnsl -lc /usr/ucblib/libucb.a ## SysV4 with BSDTIMES
-#LIBES= -lcurses -lnsl -lsocket -lc /usr/ucblib/libucb.a ## Stardent Vistra
-#LIBES= -ltermc				 ## emx under OS/2
-#LIBES=					 ## Minix, VMS_POSIX
-#LIBES= -ltermcap -lcrypt		 ## Multiflow
-#LIBES= -ltermcap -lcrypt		 ## NetBSD
-#LIBES= -lcurses 			 ## DDE Supermax
+## This is set by autoconf.
+LIBES= @LIBS@
+## BSD style things
+#LIBES= -ltermcap
+## SunOS, HP-UX, pyramid
+#LIBES= -ltermcap
+## Linux
+#LIBES= -ltermcap
+## Linux with PW_SHADOW
+#LIBES= -ltermcap -lshadow
+## Tek XD88/10 (UTekV) with PW_SHADOW
+#LIBES= -ltermcap -lsec
+## Motorola MPC (sysV88) with PW_SHADOW
+#LIBES= -ltermcap -lsec
+## Mach
+#LIBES= -ltermcap -lcs
+## DEC osf1 on the alpha
+#LIBES= -ltermcap -lbsd
+## Intel paragon
+#LIBES= -ltermcap -lbsd
+## Clipper intergraph
+#LIBES= -ltermcap -lbsd
+## Sequent's Dynix
+#LIBES= -ltermcap -lseq
+## Ultrix with Enhanced Security
+#LIBES= -ltermcap -lauth
+## Xenix 386 style things
+#LIBES= -ltermcap -ldir -lx
+## masscomp RTU6.0
+#LIBES= -ltermcap -lndir -lsocket -ljobs
+## AIX on the rt
+#LIBES= -lcurses
+## TitanOS on the stellar
+#LIBES= -lcurses
+## SysV4 w/o BSDTIMES or Solaris 2
+#LIBES= -ltermlib -lsocket -lnsl
+## SysV3 w/o networking
+#LIBES= -lcurses
+## SysV3 with networking
+#LIBES= -lcurses -lnet
+## SysV2 w/o networking & dirlib
+#LIBES= -lcurses -ldir
+## SysV2 with networking & dirlib
+#LIBES= -lcurses -ldir -lnet
+## AIX on the IBM 370 or rs6000 or ps2
+#LIBES= -lcurses -lbsd
+## ETA10
+#LIBES= -lcurses -lbsd
+## Irix3.1 on the SGI-IRIS4D
+#LIBES= -lcurses -lbsd
+## Irix3.3 on the SGI-IRIS4D w/o yp
+#LIBES= -lcurses -lbsd -lc_s
+## Irix3.3 on the SGI-IRIS4D with yp
+#LIBES= -lcurses -lsun -lbsd -lc_s
+## Amdahl UTS 2.1
+#LIBES= -lcurses -lsocket -lbsd
+## Intel's hypercube.
+#LIBES= -lcurses -lsocket
+## ns32000 based Opus.
+#LIBES= -lcurses -lsocket
+## ISC 2.2 without networking
+#LIBES= -lcurses -lcposix
+## ISC 2.2 with networking
+#LIBES= -lcposix -lc_s -lcurses -linet
+## ISC 2.0.2 without networking
+#LIBES= -lcurses -lsec -lc_s
+## ISC 2.0.2 with networking
+#LIBES= -lcurses -linet -lsec -lc_s
+## SCO SysVR3.2v2.0
+#LIBES= -lcurses -lintl -lcrypt
+## SCO+ODT1.1
+#LIBES= -lcurses -lintl -lsocket -lcrypt
+## A/UX 2.0
+#LIBES= -lposix -ltermcap
+## A/UX 3.0
+#LIBES= -lposix -ltermcap -lc_s
+## att3b1 cc w/o shared lib & dirlib
+#LIBES= -ldirent -lcurses
+## att3b1 gcc with shared lib & dirlib
+#LIBES= -shlib -ldirent -lcurses
+## SysV4 with BSDTIMES
+#LIBES= -ltermlib -lsocket -lnsl -lc /usr/ucblib/libucb.a
+## Stardent Vistra
+#LIBES= -lcurses -lnsl -lsocket -lc /usr/ucblib/libucb.a
+## emx under OS/2
+#LIBES= -ltermc
+## Minix, VMS_POSIX
+#LIBES=
+## Multiflow
+#LIBES= -ltermcap -lcrypt
+## NetBSD
+#LIBES= -ltermcap -lcrypt
+## DDE Supermax
+#LIBES= -lcurses
 
 ################################################################
 ## EXTRAFLAGS and EXTRALIBS
@@ -222,8 +285,10 @@ LIBES= @LIBS@	 			 ## This is set by autoconf.
 #
 #Solaris and HPUX require the BSD libraries with AFS.
 #We use -lc to use only what we require.
-#AFSAUXLIB = -lsocket -lnsl -lc -lucb                    # Solaris
-#AFSAUXLIB = -lc -lBSD                                   # HPUX   
+# Solaris
+#AFSAUXLIB = -lsocket -lnsl -lc -lucb
+# HPUX   
+#AFSAUXLIB = -lc -lBSD
 #
 #AFSLIB = -L$(AFSLIBDIR) -L$(AFSLIBDIR)/afs -lkauth -lprot -lubik\
 #         -lauth -lrxkad -lsys -ldes -lrx -llwp -lcom_err\
@@ -244,26 +309,38 @@ EXTRALIBS = @HESLIB@ $(AFSLIB) @LIBICONV@
 # will lose the editor and job control.
 
 # This is for setting your C preprocessor value.
-CPP = @CPP@ # This is set by autoconf.
+# This is set by autoconf.
+CPP = @CPP@
 # The -B tells gcc to use /bin/ld. This is to avoid using the gnu ld, which
 # on the suns does not know how to make dynamically linked binaries.
-CC = @CC@ # This is set by autoconf.
+# This is set by autoconf.
+CC = @CC@
 #CC= gcc -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Werror -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wsign-compare -Wcast-qual -Wreturn-type -Wswitch -Wshadow -Wwrite-strings -Wextra
-#CC=	gcc -Wall -pipe -B/bin/	# -ansi -pedantic
-#CC=	gcc -m486 -pipe -Wall # Generate code for Intel 486 (linux)
-#CC=	shlicc 	# BSDI2.1 w/ shared libraries
+# -ansi -pedantic
+#CC=	gcc -Wall -pipe -B/bin/
+# Generate code for Intel 486 (linux)
+#CC=	gcc -m486 -pipe -Wall
+# BSDI2.1 w/ shared libraries
+#CC=	shlicc
 #CC=	cc
 #CC=	occ
 #CC=	acc
 #CC=	pcc
 #CC=	hc -w
-#CC=	c89	# For VMS/POSIX
-#CC=	/bin/cc	# For suns, w/o gcc and SVR4
-#CC=	/usr/lib/sun.compile/cc  # FPS 500 (+FPX) with Sun C compiler
-#CC=	/opt/SUNWspro/bin/cc	# Solaris 2.1
-#CC=	scc 	# Alliant fx2800
-#CC=	cc	-h0,ansi,novector,float0 # for NEC SX-4
+# For VMS/POSIX
+#CC=	c89
+# For suns, w/o gcc and SVR4
+#CC=	/bin/cc
+# FPS 500 (+FPX) with Sun C compiler
+#CC=	/usr/lib/sun.compile/cc
+# Solaris 2.1
+#CC=	/opt/SUNWspro/bin/cc
+# Alliant fx2800
+#CC=	scc
+# for NEC SX-4
+#CC=	cc	-h0,ansi,novector,float0
 #CC=	lcc	-wa 
+CC_FOR_GETHOST = @CC_FOR_GETHOST@
 ED=	ed
 AS=	as
 RM=	rm
@@ -272,8 +349,10 @@ VGRIND=	csh /usr/ucb/vgrind
 CTAGS=	/usr/ucb/ctags
 #XSTR= /usr/ucb/xstr
 SCCS=	/usr/local/sccs
-PARALLEL=12				# Make the multi-max run fast.
-#P=&					# Use Sequent's parallel make
+# Make the multi-max run fast.
+PARALLEL=12
+# Use Sequent's parallel make
+#P=&
 P=
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -282,12 +361,17 @@ mandir=@datarootdir@/man
 MANSECT=1
 DESTBIN=${DESTDIR}${bindir}
 DESTMAN=${DESTDIR}${mandir}/man${MANSECT}
-# DESTMAN=${DESTDIR}/catman/man${MANSECT}	 # A/UX
-# DESTMAN=${DESTDIR}/usr/share/man/man${MANSECT} # Stardent Vistra (SysVR4)
-# DESTMAN=/usr/catman/1l			 # Amiga unix (SysVR4)
+# A/UX
+# DESTMAN=${DESTDIR}/catman/man${MANSECT}
+# Stardent Vistra (SysVR4)
+# DESTMAN=${DESTDIR}/usr/share/man/man${MANSECT}
+# Amiga unix (SysVR4)
+# DESTMAN=/usr/catman/1l
 EXEEXT=@EXEEXT@
 FTPAREA=/usr/spool/ftp
 
+BUILD_CATALOGS = @BUILD_CATALOGS@
+
 ASSRCS=	sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \
 	sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \
 	sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \
@@ -330,9 +414,9 @@ AVSRCS= Fixes MAKEDIFFS MAKESHAR NewThings README FAQ \
 	host.defs gethost.c tcsh.man2html configure.in configure config.h.in \
 	tests/testsuite.at
 TESTFILES= tests/aliases.at tests/arguments.at tests/commands.at \
-	tests/expr.at tests/lexical.at tests/mb-eucjp.at tests/mb-utf8.at \
-	tests/noexec.at tests/syntax.at tests/subst.at tests/variables.at \
-	tests/sh.dol.at
+	tests/expr.at tests/lexical.at tests/mb-eucjp.at \
+	tests/mb-utf8.at tests/noexec.at tests/syntax.at tests/subst.at \
+	tests/variables.at tests/sh.dol.at
 
 VHSRCS=${PVSRCS} ${AVSRCS}
 
@@ -345,7 +429,7 @@ DISTSRCS= ${PSSRCS} ${TWSRCS} ${EDSRCS} ${TCSRCS} ${AVSRCS} $(TESTFILES)
 OBJS= ${SHOBJS} ${TWOBJS} ${EDOBJS} ${TCOBJS}
 
 
-all: ${BUILD}
+all: ${BUILD} catalogs
 
 tcsh$(EXEEXT):$(P) ${OBJS} 
 	rm -f tcsh$(EXEEXT) core
@@ -365,7 +449,7 @@ pure:$(P) ${OBJS}
 
 gethost:  gethost.c sh.err.h tc.const.h sh.h
 	rm -f gethost
-	${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS}
+	${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} $(srcdir)/gethost.c
 
 tc.defs.c:	gethost host.defs
 	@rm -f $@.tmp
@@ -463,7 +547,7 @@ $(srcdir)/tests/package.m4: $(srcdir)/configure.in
 	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
 	} >$(srcdir)/tests/package.m4
 
-$(srcdir)/tests/testsuite: $(srcdir)/tests/package.m4 $(srcdir}/tests/testsuite.at $(TESTFILES)
+$(srcdir)/tests/testsuite: $(srcdir)/tests/package.m4 $(srcdir)/tests/testsuite.at $(TESTFILES)
 	autom4te --language=autotest -I $(srcdir)/tests \
 		$(srcdir)/tests/testsuite.at -o $@.tmp
 	mv $@.tmp $@
@@ -511,20 +595,36 @@ vgrind:
 
 install-strip: install
 
-install: tcsh$(EXEEXT) 
+install: tcsh$(EXEEXT) install.catalogs install.man
 	-mkdir -p ${DESTBIN}
 	-mv -f ${DESTBIN}/tcsh$(EXEEXT)  ${DESTBIN}/tcsh.old
 	cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT)
 	-strip ${DESTBIN}/tcsh$(EXEEXT)
 	chmod 755 ${DESTBIN}/tcsh$(EXEEXT)
 
+install.catalogs:
+	@test "x${BUILD_CATALOGS}" = "xyes" && (cd nls; ${MAKE} install DESTDIR=${DESTDIR}) || exit 0
+
 install.man: tcsh.man
 	-mkdir -p ${DESTMAN}
 	-rm -f ${DESTMAN}/tcsh.${MANSECT}
 	cp $(srcdir)/tcsh.man ${DESTMAN}/tcsh.${MANSECT}
 	chmod 444 ${DESTMAN}/tcsh.${MANSECT}
 
-install.cygwin: install install.man
+# Amiga Unix
+#install.man: tcsh.man
+#        compress tcsh.man
+#	cp tcsh.man.Z ${DESTMAN}/tcsh.Z
+#	chmod 444 ${DESTMAN}/tcsh.Z
+
+# Apple A/UX
+#install.man: tcsh.man
+#	-rm -f ${DESTMAN}/tcsh.${MANSECT}.Z
+#	nroff -man tcsh.man | compress > ${DESTMAN}/tcsh.${MANSECT}.Z
+#	chmod 444 ${DESTMAN}/tcsh.${MANSECT}.Z
+
+install.cygwin: install
+	-gzip ${DESTMAN}/tcsh.${MANSECT}
 	-mkdir -p ${DESTDIR}${prefix}/share/doc/tcsh
 	cp ${srcdir}/FAQ ${srcdir}/Fixes ${DESTDIR}${prefix}/share/doc/tcsh
 	cp ${srcdir}/NewThings ${srcdir}/README ${DESTDIR}${prefix}/share/doc/tcsh
@@ -542,24 +642,15 @@ install.cygwin: install install.man
 	cp -p ${srcdir}/cygwin/postinstall.sh ${DESTDIR}/etc/postinstall/tcsh.sh
 	cp -p ${srcdir}/cygwin/preremove.sh ${DESTDIR}/etc/preremove/tcsh.sh
 
-# Amiga Unix
-#install.man: tcsh.man
-#        compress tcsh.man
-#	cp tcsh.man.Z ${DESTMAN}/tcsh.Z
-#	chmod 444 ${DESTMAN}/tcsh.Z
-
-# Apple A/UX
-#install.man: tcsh.man
-#	-rm -f ${DESTMAN}/tcsh.${MANSECT}.Z
-#	nroff -man tcsh.man | compress > ${DESTMAN}/tcsh.${MANSECT}.Z
-#	chmod 444 ${DESTMAN}/tcsh.${MANSECT}.Z
-
-clean:
+clean: clean.catalogs
 	${RM} -f a.out strings x.c xs.c tcsh$(EXEEXT) tcsh.a _MAKE_LOG gethost
 	${RM} -f *.${SUF} *.i *.s
 	${RM} -f sh.prof.c ed.defns.h tc.const.h sh.err.h tc.defs.c
 	${RM} -f tcsh.*.m tcsh.*.cat
 
+clean.catalogs:
+	@test "x${BUILD_CATALOGS}" = "xyes" && (cd nls; ${MAKE} clean) || exit 0
+
 veryclean: clean
 	${RM} -f Makefile config.h config_p.h
 	${RM} -f config.status config.cache config.log tcsh.ps
@@ -607,7 +698,7 @@ shar:
 	rm -rf tcsh-${VERSION}
 
 catalogs:
-	@(cd nls; make catalogs)
+	@test "x${BUILD_CATALOGS}" = "xyes" && (cd nls; ${MAKE} catalogs) || exit 0
 
 tcsh-${VERSION}.tar.Z:
 	rm -rf tcsh-${VERSION}