diff options
| author | marcel <marcel@FreeBSD.org> | 2000-07-23 17:38:32 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2000-07-23 17:38:32 +0000 |
| commit | ba50f4125684beb8a3168053e62d19b3cde4f9dc (patch) | |
| tree | 8e8cbf56684b339dfb2bc17631985ccff908b19f /Makefile.inc1 | |
| parent | a069944f46211cf481f1414ec35e8e264169f6f2 (diff) | |
| download | FreeBSD-src-ba50f4125684beb8a3168053e62d19b3cde4f9dc.zip FreeBSD-src-ba50f4125684beb8a3168053e62d19b3cde4f9dc.tar.gz | |
Name all kernels 'kernel'. This fixes the incompatible behaviour
of the buildkernel and installkernel targets where the kernel
was called after the config name.
While here, fix the brokenness of the installkernel target. It
used to use ${IMAKEENV}, but since that has a very restricted
PATH, it couldn't find make(1). Use ${CROSSENV} instead.
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index bfadc55..4a0b957 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -403,11 +403,10 @@ buildkernel: ${MAKE} -f ${KRNLSRCDIR}/dev/aic7xxx/Makefile .if !defined(NO_KERNELDEPEND) cd ${KRNLOBJDIR}/${_kernel}; \ - ${WMAKEENV} MACHINE=${MACHINE} KERNEL=${_kernel} \ - ${MAKE} depend + ${WMAKEENV} MACHINE=${MACHINE} KERNEL=kernel ${MAKE} depend .endif cd ${KRNLOBJDIR}/${_kernel}; \ - ${WMAKEENV} MACHINE=${MACHINE} KERNEL=${_kernel} ${MAKE} all + ${WMAKEENV} MACHINE=${MACHINE} KERNEL=kernel ${MAKE} all .endfor # @@ -417,8 +416,7 @@ buildkernel: # installkernel: cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ - ${IMAKEENV} MACHINE=${MACHINE} KERNEL=${INSTALLKERNEL} \ - ${MAKE} KERNEL=${INSTALLKERNEL} install + ${CROSSENV} MACHINE=${MACHINE} KERNEL=kernel ${MAKE} install # # update |
