summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2000-06-17 10:56:15 +0000
committerobrien <obrien@FreeBSD.org>2000-06-17 10:56:15 +0000
commit72dbbe24eb4f86ab6c34fcc8f32b2bcabd1151e3 (patch)
tree7dfa67ecba854831946696756d5f6381a9d69ac7
parent53eb2d3431409c4cd030d84376e5cfd29c3cd3fc (diff)
downloadFreeBSD-src-72dbbe24eb4f86ab6c34fcc8f32b2bcabd1151e3.zip
FreeBSD-src-72dbbe24eb4f86ab6c34fcc8f32b2bcabd1151e3.tar.gz
Add back "NO_MODULES" as using ``make -DMODULES_WITH_WORLD'' in the
kernel build dir doesn't really say what your intentions are.
-rw-r--r--sys/conf/Makefile.alpha2
-rw-r--r--sys/conf/Makefile.i3862
-rw-r--r--sys/conf/Makefile.pc982
-rw-r--r--sys/conf/Makefile.powerpc2
4 files changed, 4 insertions, 4 deletions
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index eb496c6..b0dcd88 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -274,7 +274,7 @@ kernel-reinstall kernel-reinstall.debug:
install -c -m 555 -o root -g wheel -fschg \
${KERNEL}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KERNEL}
-.if !defined(MODULES_WITH_WORLD) && exists($S/modules)
+.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
all: modules
depend: modules-depend
clean: modules-clean
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 8460286..12654ed 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -229,7 +229,7 @@ kernel-reinstall kernel-reinstall.debug:
install -c -m 555 -o root -g wheel -fschg \
${KERNEL}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KERNEL}
-.if !defined(MODULES_WITH_WORLD) && exists($S/modules)
+.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
all: modules
depend: modules-depend
clean: modules-clean
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 870d964..f2ee3eb 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -232,7 +232,7 @@ kernel-reinstall kernel-reinstall.debug:
install -c -m 555 -o root -g wheel -fschg \
${KERNEL}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KERNEL}
-.if !defined(MODULES_WITH_WORLD) && exists($S/modules)
+.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
all: modules
depend: modules-depend
clean: modules-clean
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 8460286..12654ed 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -229,7 +229,7 @@ kernel-reinstall kernel-reinstall.debug:
install -c -m 555 -o root -g wheel -fschg \
${KERNEL}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KERNEL}
-.if !defined(MODULES_WITH_WORLD) && exists($S/modules)
+.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
all: modules
depend: modules-depend
clean: modules-clean
OpenPOWER on IntegriCloud