Index: Makefile.inc1 =================================================================== --- Makefile.inc1 (wersja 243929) +++ Makefile.inc1 (kopia robocza) @@ -588,18 +588,26 @@ kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries} # -# installcheck +# installcheckkernel # -# Checks to be sure system is ready for installworld/installkernel. +# Checks to be sure system is ready for installkernel. # -installcheck: +installcheckkernel: # +# installcheckworld +# +# Checks to be sure system is ready for installworld. +# +installcheckworld: + +# # Require DESTDIR to be set if installing for a different architecture. # .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} .if !make(distributeworld) -installcheck: installcheck_DESTDIR +installcheckkernel: installcheck_DESTDIR +installcheckworld: installcheck_DESTDIR installcheck_DESTDIR: .if !defined(DESTDIR) || empty(DESTDIR) @echo "ERROR: Please set DESTDIR!"; \ @@ -621,7 +629,7 @@ CHECK_UIDS+= proxy CHECK_GIDS+= proxy authpf .endif -installcheck: installcheck_UGID +installcheckworld: installcheck_UGID installcheck_UGID: .for uid in ${CHECK_UIDS} @if ! `id -u ${uid} >/dev/null 2>&1`; then \ @@ -670,7 +678,7 @@ EXTRA_DISTRIBUTIONS+= lib32 .endif -distributeworld installworld: installcheck +distributeworld installworld: installcheckworld mkdir -p ${INSTALLTMP} progs=$$(for prog in ${ITOOLS}; do \ if progpath=`which $$prog`; then \ @@ -895,7 +903,7 @@ # Install the kernel defined by INSTALLKERNEL # installkernel installkernel.debug \ -reinstallkernel reinstallkernel.debug: installcheck +reinstallkernel reinstallkernel.debug: installcheckkernel .if empty(INSTALLKERNEL) @echo "ERROR: No kernel \"${KERNCONF}\" to install."; \ false