Only set XDDESTDIR if it wasn't already set to allow people to
override it.
This commit is contained in:
parent
b9034ce23f
commit
bd633799af
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=263881
@ -1899,7 +1899,7 @@ CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" \
|
|||||||
CDTMP= ${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp
|
CDTMP= ${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp
|
||||||
CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
|
CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
|
||||||
CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN}
|
CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN}
|
||||||
XDDESTDIR=${DESTDIR}/${XDTP}
|
XDDESTDIR?=${DESTDIR}/${XDTP}
|
||||||
.if !defined(OSREL)
|
.if !defined(OSREL)
|
||||||
OSREL!= uname -r | sed -e 's/[-(].*//'
|
OSREL!= uname -r | sed -e 's/[-(].*//'
|
||||||
.endif
|
.endif
|
||||||
|
Loading…
Reference in New Issue
Block a user