diff options
| author | ian <ian@FreeBSD.org> | 2013-12-13 17:00:25 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2013-12-13 17:00:25 +0000 |
| commit | be8c9bf1f0808be3f768dfe7dd6876e09347e38a (patch) | |
| tree | a7633db9412f8de7f49cf3f83267cc7b6d75ddf2 /Makefile.inc1 | |
| parent | 7779917bec1e6386147a0c22b24ed02b0005b3fc (diff) | |
| download | FreeBSD-src-be8c9bf1f0808be3f768dfe7dd6876e09347e38a.zip FreeBSD-src-be8c9bf1f0808be3f768dfe7dd6876e09347e38a.tar.gz | |
MFC 256640: Allow 'make xdev' to work when DESTDIR is set.
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 2285c89..6fd6835 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1857,7 +1857,7 @@ NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \ CPUTYPE=${XDEV_CPUTYPE} XDDIR=${XDEV_ARCH}-freebsd -XDTP=/usr/${XDDIR} +XDTP=usr/${XDDIR} CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ INSTALL="sh ${.CURDIR}/tools/install.sh" CDENV= ${CDBENV} \ @@ -1870,8 +1870,8 @@ CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" \ CDTMP= ${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN} -CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDTP}/usr/bin:${PATH} ${MAKE} ${NOFUN} -XDDESTDIR=${DESTDIR}${XDTP} +CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN} +XDDESTDIR=${DESTDIR}/${XDTP} .if !defined(OSREL) OSREL!= uname -r | sed -e 's/[-(].*//' .endif @@ -1951,6 +1951,7 @@ _xi-libraries: _xi-links: ${_+_}cd ${XDDESTDIR}/usr/bin; \ + mkdir -p ../../../../usr/bin; \ for i in *; do \ ln -sf ../../${XDTP}/usr/bin/$$i \ ../../../../usr/bin/${XDDIR}-$$i; \ |
