d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename KRNLSRCDIR to KERNSRCDIR and allow it to be overridden. The name

Browse Source 
change was to be consistent with other overridable variables such as
KERNCONFDIR and KERNCONF.
This commit is contained in:
John Baldwin 2003-04-16 21:05:06 +00:00
parent a300701213
commit 69e7419512
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.inc1
View File

@ -460,9 +460,9 @@ KERNCONF?= GENERIC
.endif .endif
INSTKERNNAME?= kernel INSTKERNNAME?= kernel
KRNLSRCDIR= ${.CURDIR}/sys KERNSRCDIR?= ${.CURDIR}/sys
KRNLCONFDIR= ${KRNLSRCDIR}/${TARGET}/conf KRNLCONFDIR= ${KERNSRCDIR}/${TARGET}/conf
KRNLOBJDIR= ${OBJTREE}${KRNLSRCDIR} KRNLOBJDIR= ${OBJTREE}${KERNSRCDIR}
KERNCONFDIR?= ${KRNLCONFDIR} KERNCONFDIR?= ${KRNLCONFDIR}
BUILDKERNELS= BUILDKERNELS=
@ -510,12 +510,12 @@ buildkernel:
${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} ${CLEANDIR} ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} ${CLEANDIR}
.endif .endif
cd ${KRNLOBJDIR}/${_kernel}; \ cd ${KRNLOBJDIR}/${_kernel}; \
MAKESRCPATH=${KRNLSRCDIR}/dev/aic7xxx/aicasm \ MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \
${MAKE} -DNO_CPU_CFLAGS -f ${KRNLSRCDIR}/dev/aic7xxx/aicasm/Makefile ${MAKE} -DNO_CPU_CFLAGS -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile
cd ${KRNLOBJDIR}/${_kernel}; \ cd ${KRNLOBJDIR}/${_kernel}; \
${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} obj ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} obj
# XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case.
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KRNLSRCDIR}/modules) .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules)
.for target in obj depend all .for target in obj depend all
cd ${.CURDIR}/sys/modules/aic7xxx/aicasm; \ cd ${.CURDIR}/sys/modules/aic7xxx/aicasm; \
MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
@ -676,7 +676,7 @@ bootstrap-tools:
# #
# build-tools: Build special purpose build tools # build-tools: Build special purpose build tools
# #
.if defined(MODULES_WITH_WORLD) && exists(${KRNLSRCDIR}/modules) .if defined(MODULES_WITH_WORLD) && exists(${KERNSRCDIR}/modules)
_aicasm= sys/modules/aic7xxx/aicasm _aicasm= sys/modules/aic7xxx/aicasm
.endif .endif