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