NOCLEAN -> NO_CLEAN

NOCLEANDIR -> NO_CLEANDIR
This commit is contained in:
Ruslan Ermilov 2004-12-21 12:21:26 +00:00
parent d499d50264
commit f45a5bbda4
5 changed files with 12 additions and 10 deletions

View File

@ -5,8 +5,8 @@
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
# -DNO_KERBEROS Do not build Heimdal (Kerberos 5) # -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
# -DNO_RESCUE do not build rescue binaries # -DNO_RESCUE do not build rescue binaries
# -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
# -DNOCLEAN do not clean at all # -DNO_CLEAN do not clean at all
# -DNO_CRYPT will prevent building of crypt versions # -DNO_CRYPT will prevent building of crypt versions
# -DNO_MAN do not build the manual pages # -DNO_MAN do not build the manual pages
# -DNO_PROFILE do not build profiled libraries # -DNO_PROFILE do not build profiled libraries
@ -76,7 +76,7 @@ SUBDIR+= ${_DIR}
SUBDIR= ${SUBDIR_OVERRIDE} SUBDIR= ${SUBDIR_OVERRIDE}
.endif .endif
.if defined(NOCLEANDIR) .if defined(NO_CLEANDIR)
CLEANDIR= clean cleandepend CLEANDIR= clean cleandepend
.else .else
CLEANDIR= cleandir CLEANDIR= cleandir
@ -273,7 +273,7 @@ _worldtmp:
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> Rebuilding the temporary build tree" @echo ">>> Rebuilding the temporary build tree"
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
.if !defined(NOCLEAN) .if !defined(NO_CLEAN)
rm -rf ${WORLDTMP} rm -rf ${WORLDTMP}
.else .else
rm -rf ${WORLDTMP}/legacy/usr/include rm -rf ${WORLDTMP}/legacy/usr/include
@ -327,7 +327,7 @@ _bootstrap-tools:
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${BMAKE} bootstrap-tools ${_+_}cd ${.CURDIR}; ${BMAKE} bootstrap-tools
_cleanobj: _cleanobj:
.if !defined(NOCLEAN) .if !defined(NO_CLEAN)
@echo @echo
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> stage 2.1: cleaning up the object tree" @echo ">>> stage 2.1: cleaning up the object tree"
@ -664,7 +664,7 @@ buildkernel:
config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \ config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \
${KERNCONFDIR}/${_kernel} ${KERNCONFDIR}/${_kernel}
.endif .endif
.if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN) .if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN)
@echo @echo
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> stage 2.1: cleaning up the object tree" @echo ">>> stage 2.1: cleaning up the object tree"

View File

@ -501,7 +501,7 @@ release rerelease:
echo "fi" >> ${_MK} echo "fi" >> ${_MK}
echo "if [ ! -f /tmp/.world_done ]; then" >> ${_MK} echo "if [ ! -f /tmp/.world_done ]; then" >> ${_MK}
echo " cd /usr/src" >> ${_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 " touch /tmp/.world_done || exit 1" >> ${_MK}
echo "fi" >> ${_MK} echo "fi" >> ${_MK}
echo "if [ ! -f /tmp/.skip_ports_index ]; then" >> ${_MK} echo "if [ ! -f /tmp/.skip_ports_index ]; then" >> ${_MK}

View File

@ -154,7 +154,7 @@ create_includes_and_libraries2() {
MAKEOBJDIRPREFIX=${l_objtree} MAKEOBJDIRPREFIX=${l_objtree}
export MAKEOBJDIRPREFIX export MAKEOBJDIRPREFIX
( cd ${SRC}; ( 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
) )
} }

View File

@ -519,12 +519,12 @@ Set to not build and install
.Pa /bin/csh .Pa /bin/csh
(which is (which is
.Xr tcsh 1 ) . .Xr tcsh 1 ) .
.It Va NOCLEAN .It Va NO_CLEAN
.Pq Vt bool .Pq Vt bool
Set this to disable cleaning during Set this to disable cleaning during
.Dq Li "make buildworld" . .Dq Li "make buildworld" .
This should not be set unless you know what you are doing. This should not be set unless you know what you are doing.
.It Va NOCLEANDIR .It Va NO_CLEANDIR
.Pq Vt bool .Pq Vt bool
Set this to run Set this to run
.Dq Li "${MAKE} clean" .Dq Li "${MAKE} clean"

View File

@ -3,6 +3,8 @@
.if !defined(BURN_BRIDGES) .if !defined(BURN_BRIDGES)
.for oldnew in \ .for oldnew in \
NOATM:NO_ATM \ NOATM:NO_ATM \
NOCLEAN:NO_CLEAN \
NOCLEANDIR:NO_CLEANDIR \
NOCRYPT:NO_CRYPT \ NOCRYPT:NO_CRYPT \
NODOCCOMPRESS:NO_DOCCOMPRESS \ NODOCCOMPRESS:NO_DOCCOMPRESS \
NOEXTRADEPEND:NO_EXTRADEPEND \ NOEXTRADEPEND:NO_EXTRADEPEND \