diff options
author | imp <imp@FreeBSD.org> | 2014-07-10 18:28:12 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2014-07-10 18:28:12 +0000 |
commit | cb693195c629cb15f468852d1ee1ba1a147b6f5a (patch) | |
tree | 06a05c309bc1812d50369702f1feb71d4a6915ce /Makefile.inc1 | |
parent | c8f08e815af7e443d5d77edc61d9c7b245a6ba4f (diff) | |
download | FreeBSD-src-cb693195c629cb15f468852d1ee1ba1a147b6f5a.zip FreeBSD-src-cb693195c629cb15f468852d1ee1ba1a147b6f5a.tar.gz |
Separate out the links creation from the other targets. This was
supposed to have been done for the original commit, but somebody
forgot.
Pointy-hat-to: imp@
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 9ba5c8c..484cafb 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1893,7 +1893,7 @@ XDDESTDIR=${DESTDIR}/${XDTP} OSREL!= uname -r | sed -e 's/[-(].*//' .endif -.ORDER: xdev-build xdev-install +.ORDER: xdev-build xdev-install xdev-links xdev: xdev-build xdev-install .ORDER: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools @@ -1943,8 +1943,8 @@ _xi-mtree: mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${XDDESTDIR}/usr/include >/dev/null -.ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links -xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links +.ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries +xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-cross-tools: @echo "_xi-cross-tools" @@ -1967,9 +1967,9 @@ _xi-libraries: ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries \ DESTDIR=${XDDESTDIR} -_xi-links: +xdev-links: ${_+_}cd ${XDDESTDIR}/usr/bin; \ - mkdir -p ../../../../usr/bin; \ + mkdir -p ../../../../usr/bin; \ for i in *; do \ ln -sf ../../${XDTP}/usr/bin/$$i \ ../../../../usr/bin/${XDDIR}-$$i; \ @@ -1977,6 +1977,6 @@ _xi-links: ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \ done .else -xdev xdev-build xdev-install: +xdev xdev-build xdev-install xdev-links: @echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target" .endif |