summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2004-12-21 09:08:06 +0000
committerru <ru@FreeBSD.org>2004-12-21 09:08:06 +0000
commit3b01b845055a6c3374f14bc8997be5a5d299cd8c (patch)
treeea5c405d23bdd55d5a9515d9d087b9542b86e2aa /share
parentba3655c74f170d85d1349f1e286aff27b58c9fc5 (diff)
downloadFreeBSD-src-3b01b845055a6c3374f14bc8997be5a5d299cd8c.zip
FreeBSD-src-3b01b845055a6c3374f14bc8997be5a5d299cd8c.tar.gz
NOATM -> NO_ATM
Diffstat (limited to 'share')
-rw-r--r--share/examples/etc/make.conf4
-rw-r--r--share/man/man5/make.conf.52
-rw-r--r--share/mk/bsd.compat.mk1
-rw-r--r--share/mk/bsd.init.mk1
4 files changed, 5 insertions, 3 deletions
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index d85e10e2..5818569 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -106,7 +106,7 @@
#
# To avoid building various parts of the base system:
#NO_ACPI= # do not build acpiconf(8) and related programs
-#NOATM= # do not build ATM related programs and libraries
+#NO_ATM= # do not build ATM related programs and libraries
#NO_AUTHPF= # do not build and install authpf (setuid/gid)
#NO_BLUETOOTH= # do not build Bluetooth related stuff
#NO_BOOT= # do not build boot blocks and loader
@@ -128,7 +128,7 @@
#NO_LIBTHR= # do not build libthr (1:1 threading library)
#NO_LPR= # do not build lpr and related programs
#NO_MAILWRAPPER= # do not build the mailwrapper(8) MTA selector
-#NO_MAN= # do not build manual pages
+#NO_MAN= # do not build manual pages
#NO_MODULES= # do not build modules with the kernel
#NO_NIS= # do not build NIS support and related programs
#NO_OBJC= # do not build Objective C support
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index f48d714..8ef203e 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -463,7 +463,7 @@ programs and libraries related to IPv6 networking.
Build
.Xr ppp 8
without support for network address translation (NAT).
-.It Va NOATM
+.It Va NO_ATM
.Pq Vt bool
Set to not build
programs and libraries related to ATM networking.
diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk
index 1bc4c38..e15d480 100644
--- a/share/mk/bsd.compat.mk
+++ b/share/mk/bsd.compat.mk
@@ -2,6 +2,7 @@
.if !defined(BURN_BRIDGES)
.for oldnew in \
+ NOATM:NO_ATM \
NOLIBC_R:NO_LIBC_R \
NOLIBPTHREAD:NO_LIBPTHREAD \
NOLIBTHR:NO_LIBTHR \
diff --git a/share/mk/bsd.init.mk b/share/mk/bsd.init.mk
index ff6517c..13665c0 100644
--- a/share/mk/bsd.init.mk
+++ b/share/mk/bsd.init.mk
@@ -9,6 +9,7 @@ __<bsd.init.mk>__:
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
.endif
+.include <bsd.compat.mk>
.include <bsd.own.mk>
.MAIN: all
.endif !target(__<bsd.init.mk>__)
OpenPOWER on IntegriCloud