Reimplementation of world/kernel build options. For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by:	imp, jhb, kris, phk, ru (all bugs are mine)

1 files changed, 4 insertions, 2 deletions

diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index dd3b002b7082..fb58cfbcc323 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -6,6 +6,8 @@
 #
 # To profile, put -DPROF in DEFS and -pg in CFLAGS, and recompile.
 
+.include <bsd.own.mk>
+
 TCSHDIR= ${.CURDIR}/../../contrib/tcsh
 .PATH: ${TCSHDIR}
 
@@ -45,7 +47,7 @@ LINKS=	${BINDIR}/csh ${BINDIR}/tcsh
 
 CLEANFILES= ${GENHDRS} gethost csh.1
 
-.if !defined(NO_EXAMPLES)
+.if ${MK_EXAMPLES} != "no"
 FILESDIR= ${SHAREDIR}/examples/tcsh
 FILES= complete.tcsh csh-mode.el
 .endif
@@ -70,7 +72,7 @@ NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
 NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15
 NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15
 
-.if defined(NO_NLS_CATALOGS) || defined(RESCUE)
+.if ${MK_NLS_CATALOGS} == "no" || defined(RESCUE)
 CFLAGS+= -DNO_NLS_CATALOGS
 .else
 CFLAGS+= -DHAVE_ICONV