summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.inc16
-rwxr-xr-xrelease/picobsd/build/picobsd2
-rw-r--r--share/examples/etc/make.conf2
-rw-r--r--share/man/man5/make.conf.52
-rw-r--r--share/mk/bsd.compat.mk1
5 files changed, 7 insertions, 6 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index cd38bdb..f758e94 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -11,7 +11,7 @@
# -DNO_MAN do not build the manual pages
# -DNO_PROFILE do not build profiled libraries
# -DNO_GAMES do not go into games subdir
-# -DNOSHARE do not go into share subdir
+# -DNO_SHARE do not go into share subdir
# -DNO_INFO do not make or install info files
# -DNO_LIBC_R do not build libc_r.
# -DNO_FORTRAN do not build g77 and related libraries.
@@ -59,7 +59,7 @@ SUBDIR+=sbin
.if !defined(NO_CRYPT)
SUBDIR+=secure
.endif
-.if !defined(NOSHARE)
+.if !defined(NO_SHARE)
SUBDIR+=share
.endif
SUBDIR+=sys usr.bin usr.sbin etc
@@ -876,7 +876,7 @@ bootstrap-tools:
_aicasm= sys/modules/aic7xxx/aicasm
.endif
-.if !defined(NOSHARE)
+.if !defined(NO_SHARE)
_share= share/syscons/scrnmaps
.endif
diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd
index 023201f..ff6bf48 100755
--- a/release/picobsd/build/picobsd
+++ b/release/picobsd/build/picobsd
@@ -182,7 +182,7 @@ create_includes_and_libraries() {
BINOWN=`id -un` BINGRP=`id -gn` \
DESTDIR=${l_usrtree}/.. \
make -m ${SRC}/share/mk \
- -DNO_HTML -DNO_INFO -DNO_MAN -DNOSHARE -DNO_FSCHG "
+ -DNO_HTML -DNO_INFO -DNO_MAN -DNO_SHARE -DNO_FSCHG "
log "do a 'make obj' in a few places."
# This is very version-specific... The following works for 5.0
for i in lib secure/lib gnu/lib usr.sbin/pcvt/keycap \
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index cab2916..dabb650 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -137,7 +137,7 @@
#NO_PF= # do not build PF firewall package
#NO_PROFILE= # Avoid compiling profiled libraries
#NO_SENDMAIL= # do not build sendmail and related programs
-#NOSHARE= # do not go into the share subdir
+#NO_SHARE= # do not go into the share subdir
#NO_SHARED= # build /bin and /sbin dynamically linked (bad idea
#NO_SHAREDOCS= # do not build the 4.4BSD legacy docs
#NO_TCSH= # do not build and install /bin/csh (which is tcsh)
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 4090f5d..f2394bf 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -565,7 +565,7 @@ Set to install man pages uncompressed.
.It Va NO_PROFILE
.Pq Vt bool
Set to avoid compiling profiled libraries.
-.It Va NOSHARE
+.It Va NO_SHARE
.Pq Vt bool
Set to not build in the
.Pa share
diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk
index c6edb8b..d8651ab 100644
--- a/share/mk/bsd.compat.mk
+++ b/share/mk/bsd.compat.mk
@@ -23,6 +23,7 @@
NOOBJ:NO_OBJ \
NOPIC:NO_PIC \
NOPROFILE:NO_PROFILE \
+ NOSHARE:NO_SHARE \
NOSHARED:NO_SHARED \
NOTAGS:NO_TAGS
.for old in ${oldnew:C/:.*//}
OpenPOWER on IntegriCloud