--- elwix/files/csh/Makefile	2013/08/05 13:10:17	1.3
+++ elwix/files/csh/Makefile	2021/07/16 18:35:50	1.4
@@ -1,4 +1,4 @@
-# $FreeBSD: src/bin/csh/Makefile,v 1.42 2012/02/22 03:36:15 mp Exp $
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 #
 # C Shell with process control; VM/UNIX VAX Makefile
@@ -6,7 +6,7 @@
 #
 # To profile, put -DPROF in DEFS and -pg in CFLAGS, and recompile.
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 BINDIR =	/usr/bin
 BSDSRC ?=	/usr/src
@@ -31,6 +31,7 @@ SRCS+=	tc.alloc.c tc.bind.c tc.const.c tc.decls.h tc.d
 	tc.func.c tc.nls.c tc.os.c tc.os.h tc.printf.c tc.prompt.c \
 	tc.sched.c tc.sig.c tc.sig.h tc.str.c sh.types.h tc.vers.c tc.wait.h \
 	tc.who.c tc.h
+SRCS+=	dotlock.c dotlock.h
 GENHDRS= ed.defns.h sh.err.h tc.const.h tc.defs.c
 SRCS+=	${GENHDRS}
 
@@ -52,15 +53,16 @@ csh.1: tcsh.man
 
 build-tools: gethost
 
-gethost: gethost.c sh.err.h tc.const.h sh.h
+DEPENDOBJS+= gethost
+gethost: gethost.c sh.err.h tc.const.h sh.h ${BUILD_TOOLS_META}
 	@rm -f ${.TARGET}
-	${CC} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \
+	${CC:N${CCACHE_BIN}} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \
 	    ${TCSHDIR}/gethost.c
 
 tc.defs.c: gethost ${TCSHDIR}/host.defs
 	@rm -f ${.TARGET}
 	@echo "/* Do not edit this file, make creates it */" > ${.TARGET}
-	./gethost ${TCSHDIR}/host.defs >> ${.TARGET}
+	${BTOOLSPATH:U.}/gethost ${TCSHDIR}/host.defs >> ${.TARGET}
 
 ed.defns.h: ed.defns.c
 	@rm -f ${.TARGET}
@@ -78,12 +80,12 @@ sh.err.h: sh.err.c
 	grep 'ERR_' ${.ALLSRC} | grep '^#define' >> ${.TARGET}
 	@echo '#endif /* _h_sh_err */' >> ${.TARGET}
 
-tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h
+tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h ${BUILD_TOOLS_META}
 	@rm -f ${.TARGET}
 	@echo '/* Do not edit this file, make creates it. */' > ${.TARGET}
 	@echo '#ifndef _h_tc_const' >> ${.TARGET}
 	@echo '#define _h_tc_const' >> ${.TARGET}
-	${CC} -E ${CFLAGS:C/-DHAVE_ICONV//} ${.ALLSRC} -D_h_tc_const | \
+	${CC:N${CCACHE_BIN}} -E ${CFLAGS:C/-DHAVE_ICONV//} ${.ALLSRC} -D_h_tc_const | \
 	    grep 'Char STR' | \
 	    sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
 	    sort >> ${.TARGET}