aboutsummaryrefslogtreecommitdiff
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorGordon Tetlow <gordon@FreeBSD.org>2003-07-14 16:21:16 +0000
committerGordon Tetlow <gordon@FreeBSD.org>2003-07-14 16:21:16 +0000
commit234a6529648a7e3fa03bdaf5e7b71e7b3b62225a (patch)
tree64c65d984f81bd0ad5ac26c751af5de2d7eb907d /Makefile.inc1
parent055c90456eced7341ece07074c0655dae8b92ce1 (diff)
downloadsrc-234a6529648a7e3fa03bdaf5e7b71e7b3b62225a.tar.gz
src-234a6529648a7e3fa03bdaf5e7b71e7b3b62225a.zip
Apparently we prefer underscores in new options. Sorry for the churn folks.
Requested by: obrien
Notes
Notes: svn path=/head/; revision=117555
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc110
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 3934c67a808b..0ef908f9e588 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -3,12 +3,12 @@
#
# Make command line options:
# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
+# -DNO_RESCUE do not build rescue binaries
# -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
# -DNOCLEAN do not clean at all
# -DNOCRYPT will prevent building of crypt versions
# -DNOMAN do not build the manual pages
# -DNOPROFILE do not build profiled libraries
-# -DNORESCUE do not build rescue binaries
# -DNOGAMES do not go into games subdir
# -DNOSHARE do not go into share subdir
# -DNOINFO do not make or install info files
@@ -67,7 +67,7 @@ SUBDIR+= kerberos5
.if exists(${.CURDIR}/libexec)
SUBDIR+= libexec
.endif
-.if exists(${.CURDIR}/rescue) && !defined(NORESCUE)
+.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE)
SUBDIR+= rescue
.endif
.if exists(${.CURDIR}/sbin)
@@ -668,7 +668,7 @@ _xargs= usr.bin/xargs
_yacc= usr.bin/yacc
.endif
-.if !defined(NORESCUE) && \
+.if !defined(NO_RESCUE) && \
${BOOTSTRAPPING} < 501100
_crunchgen= usr.sbin/crunch/crunchgen
.endif
@@ -722,7 +722,7 @@ _libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \
kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl
.endif
-.if exists(${.CURDIR}/rescue) && !defined(NORESCUE)
+.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE)
_rescue= rescue/rescue
.endif
@@ -758,7 +758,7 @@ _elf2aout= usr.bin/elf2aout
_btxld= usr.sbin/btxld
.endif
-.if (!defined(NORESCUE) || \
+.if (!defined(NO_RESCUE) || \
defined(RELEASEDIR)) && \
( ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101 )
_crunchide= usr.sbin/crunch/crunchide