diff options
author | ru <ru@FreeBSD.org> | 2006-03-17 18:54:44 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2006-03-17 18:54:44 +0000 |
commit | 388e590f951441f619cd32710dc151e0ac810a10 (patch) | |
tree | 801e953598fc63a37f62cf997017301675552fe9 /bin | |
parent | a251964eaca5833ff2c4651fe4f7f8cac7199da5 (diff) | |
download | FreeBSD-src-388e590f951441f619cd32710dc151e0ac810a10.zip FreeBSD-src-388e590f951441f619cd32710dc151e0ac810a10.tar.gz |
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)
Diffstat (limited to 'bin')
-rw-r--r-- | bin/Makefile | 8 | ||||
-rw-r--r-- | bin/Makefile.inc | 4 | ||||
-rw-r--r-- | bin/csh/Makefile | 6 | ||||
-rw-r--r-- | bin/ed/Makefile | 4 |
4 files changed, 15 insertions, 7 deletions
diff --git a/bin/Makefile b/bin/Makefile index a56de99..1b3ee7a 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -1,6 +1,8 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include <bsd.own.mk> + SUBDIR= cat \ chflags \ chio \ @@ -37,15 +39,15 @@ SUBDIR= cat \ sync \ test -.if !defined(NO_RCMDS) +.if ${MK_RCMDS} != "no" _rcp= rcp .endif -.if !defined(NO_SENDMAIL) +.if ${MK_SENDMAIL} != "no" _rmail= rmail .endif -.if !defined(NO_TCSH) +.if ${MK_TCSH} != "no" _csh= csh .endif diff --git a/bin/Makefile.inc b/bin/Makefile.inc index b1f1612..ec24a48 100644 --- a/bin/Makefile.inc +++ b/bin/Makefile.inc @@ -1,9 +1,11 @@ # @(#)Makefile.inc 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include <bsd.own.mk> + BINDIR?= /bin WARNS?= 6 -.if defined(NO_DYNAMICROOT) +.if ${MK_DYNAMICROOT} == "no" NO_SHARED?= YES .endif diff --git a/bin/csh/Makefile b/bin/csh/Makefile index dd3b002..fb58cfb 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 diff --git a/bin/ed/Makefile b/bin/ed/Makefile index 9e6afd7..0679fe8 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -1,11 +1,13 @@ # $FreeBSD$ +.include <bsd.own.mk> + PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 -.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) +.if ${MK_OPENSSL} != "no" CFLAGS+=-DDES WARNS?= 2 DPADD= ${LIBCRYPTO} |