diff options
| -rw-r--r-- | Makefile.inc1 | 12 | ||||
| -rw-r--r-- | release/Makefile | 2 | ||||
| -rwxr-xr-x | release/picobsd/build/picobsd | 2 | ||||
| -rw-r--r-- | share/man/man5/make.conf.5 | 4 | ||||
| -rw-r--r-- | share/mk/bsd.compat.mk | 2 |
5 files changed, 12 insertions, 10 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index f758e94824c1..03180cb13193 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -5,8 +5,8 @@ # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically # -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 +# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir +# -DNO_CLEAN do not clean at all # -DNO_CRYPT will prevent building of crypt versions # -DNO_MAN do not build the manual pages # -DNO_PROFILE do not build profiled libraries @@ -76,7 +76,7 @@ SUBDIR+= ${_DIR} SUBDIR= ${SUBDIR_OVERRIDE} .endif -.if defined(NOCLEANDIR) +.if defined(NO_CLEANDIR) CLEANDIR= clean cleandepend .else CLEANDIR= cleandir @@ -273,7 +273,7 @@ _worldtmp: @echo "--------------------------------------------------------------" @echo ">>> Rebuilding the temporary build tree" @echo "--------------------------------------------------------------" -.if !defined(NOCLEAN) +.if !defined(NO_CLEAN) rm -rf ${WORLDTMP} .else rm -rf ${WORLDTMP}/legacy/usr/include @@ -327,7 +327,7 @@ _bootstrap-tools: @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${BMAKE} bootstrap-tools _cleanobj: -.if !defined(NOCLEAN) +.if !defined(NO_CLEAN) @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2.1: cleaning up the object tree" @@ -664,7 +664,7 @@ buildkernel: config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \ ${KERNCONFDIR}/${_kernel} .endif -.if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN) +.if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN) @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2.1: cleaning up the object tree" diff --git a/release/Makefile b/release/Makefile index 4af7c4529791..7ecb756a8793 100644 --- a/release/Makefile +++ b/release/Makefile @@ -501,7 +501,7 @@ release rerelease: echo "fi" >> ${_MK} echo "if [ ! -f /tmp/.world_done ]; then" >> ${_MK} echo " cd /usr/src" >> ${_MK} - echo " ${CROSSMAKE} ${WORLD_FLAGS} -DNOCLEAN buildworld && \\" >> ${_MK} + echo " ${CROSSMAKE} ${WORLD_FLAGS} -DNO_CLEAN buildworld && \\" >> ${_MK} echo " touch /tmp/.world_done || exit 1" >> ${_MK} echo "fi" >> ${_MK} echo "if [ ! -f /tmp/.skip_ports_index ]; then" >> ${_MK} diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd index ff6bf48fff8b..1f218051b8a0 100755 --- a/release/picobsd/build/picobsd +++ b/release/picobsd/build/picobsd @@ -154,7 +154,7 @@ create_includes_and_libraries2() { MAKEOBJDIRPREFIX=${l_objtree} export MAKEOBJDIRPREFIX ( cd ${SRC}; - make -DNOCLEAN -DNO_PROFILE -DNO_GAMES -DNO_LIBC_R -DPICOBSD buildworld + make -DNO_CLEAN -DNO_PROFILE -DNO_GAMES -DNO_LIBC_R -DPICOBSD buildworld ) } diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index f2394bfcc688..fef329e78ce2 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -519,12 +519,12 @@ Set to not build and install .Pa /bin/csh (which is .Xr tcsh 1 ) . -.It Va NOCLEAN +.It Va NO_CLEAN .Pq Vt bool Set this to disable cleaning during .Dq Li "make buildworld" . This should not be set unless you know what you are doing. -.It Va NOCLEANDIR +.It Va NO_CLEANDIR .Pq Vt bool Set this to run .Dq Li "${MAKE} clean" diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index d8651ab5949b..03aa3346b2c1 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -3,6 +3,8 @@ .if !defined(BURN_BRIDGES) .for oldnew in \ NOATM:NO_ATM \ + NOCLEAN:NO_CLEAN \ + NOCLEANDIR:NO_CLEANDIR \ NOCRYPT:NO_CRYPT \ NODOCCOMPRESS:NO_DOCCOMPRESS \ NOEXTRADEPEND:NO_EXTRADEPEND \ |