summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/Makefile4
-rw-r--r--etc/defaults/make.conf7
-rw-r--r--share/examples/etc/make.conf7
3 files changed, 13 insertions, 5 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 4be00aa..2dc2b2c 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -92,11 +92,13 @@ distribution:
(cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${SSL} \
${DESTDIR}/etc/ssl )
.endif
-.if !defined(NO_MAKEDEV)
+.if !defined(NO_MAKEDEV_INSTALL)
( cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
MAKEDEV.local MAKEDEV ${DESTDIR}/dev )
+.if !defined(NO_MAKEDEV_RUN)
(cd ${DESTDIR}/dev; sh MAKEDEV all)
.endif
+.endif
(cd ${.CURDIR}/root; \
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 dot.cshrc \
${DESTDIR}/root/.cshrc; \
diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index 3860a14..5328984 100644
--- a/etc/defaults/make.conf
+++ b/etc/defaults/make.conf
@@ -128,8 +128,11 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \
# be OK to use for any non-commercial use. This is optional.
#MAKE_IDEA= YES # IDEA (128 bit symmetric encryption)
#
-# To avoid running MAKEDEV all on /dev during install:
-#NO_MAKEDEV= true
+# To avoid running MAKEDEV all on /dev during install set NO_MAKEDEV_RUN.
+# If you don't want to install MAKEDEV set NO_MAKEDEV_INSTALL, this implies
+# NO_MAKEDEV_RUN.
+#NO_MAKEDEV_INSTALL= true
+#NO_MAKEDEV_RUN= true
#
# If you do not want unformatted manual pages to be compressed
# when they are installed:
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 3860a14..5328984 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -128,8 +128,11 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \
# be OK to use for any non-commercial use. This is optional.
#MAKE_IDEA= YES # IDEA (128 bit symmetric encryption)
#
-# To avoid running MAKEDEV all on /dev during install:
-#NO_MAKEDEV= true
+# To avoid running MAKEDEV all on /dev during install set NO_MAKEDEV_RUN.
+# If you don't want to install MAKEDEV set NO_MAKEDEV_INSTALL, this implies
+# NO_MAKEDEV_RUN.
+#NO_MAKEDEV_INSTALL= true
+#NO_MAKEDEV_RUN= true
#
# If you do not want unformatted manual pages to be compressed
# when they are installed:
OpenPOWER on IntegriCloud