Look up ${CUSTOMIZE} in ${.CURDIR} first, and then as a path name by itself,
assuming in the latter case that it is an absolute path name.
This commit is contained in:
parent
6f8f915b4c
commit
5141d0dd23
@ -31,7 +31,7 @@ WD?= ${.OBJDIR}/_.w
|
|||||||
#
|
#
|
||||||
# The final resulting image is in ${.OBJDIR}/_.i and the single slice
|
# The final resulting image is in ${.OBJDIR}/_.i and the single slice
|
||||||
# image in ${.OBJDIR}/_.i.s1
|
# image in ${.OBJDIR}/_.i.s1
|
||||||
|
#
|
||||||
|
|
||||||
# Main target
|
# Main target
|
||||||
all: buildworld installworld buildimage
|
all: buildworld installworld buildimage
|
||||||
@ -48,10 +48,10 @@ _.cs: _.iw _.di _.ik _.di
|
|||||||
sed -i "" -e /beastie/d ${WD}/boot/loader.rc
|
sed -i "" -e /beastie/d ${WD}/boot/loader.rc
|
||||||
sed -i "" -e /ttyd0/s/off/on/ ${WD}/etc/ttys
|
sed -i "" -e /ttyd0/s/off/on/ ${WD}/etc/ttys
|
||||||
echo " -h" > ${WD}/boot.config
|
echo " -h" > ${WD}/boot.config
|
||||||
.elif exists(${CUSTOMIZE})
|
|
||||||
sh -e ${CUSTOMIZE} ${WD} ${WORLDDIR} ${.CURDIR}
|
|
||||||
.elif exists(${.CURDIR}/${CUSTOMIZE})
|
.elif exists(${.CURDIR}/${CUSTOMIZE})
|
||||||
sh -e ${.CURDIR}/${CUSTOMIZE} ${WD} ${WORLDDIR} ${.CURDIR}
|
sh -e ${.CURDIR}/${CUSTOMIZE} ${WD} ${WORLDDIR} ${.CURDIR}
|
||||||
|
.elif exists(${CUSTOMIZE})
|
||||||
|
sh -e ${CUSTOMIZE} ${WD} ${WORLDDIR} ${.CURDIR}
|
||||||
.else
|
.else
|
||||||
echo "CUSTOMIZE script not found" 1>&2
|
echo "CUSTOMIZE script not found" 1>&2
|
||||||
false
|
false
|
||||||
|
Loading…
x
Reference in New Issue
Block a user