diff options
| author | Erwin Lansing <erwin@FreeBSD.org> | 2006-08-04 12:34:50 +0000 |
|---|---|---|
| committer | Erwin Lansing <erwin@FreeBSD.org> | 2006-08-04 12:34:50 +0000 |
| commit | 50513d5d5238ab12e0e327b93bf433d7d288aeeb (patch) | |
| tree | a01dbbed0a08990ed895d4f97017c2593d8d7172 /Mk/bsd.port.subdir.mk | |
| parent | a72afe28c2216c151a1fc5aa900c8abf9c7a709e (diff) | |
| download | ports-50513d5d5238ab12e0e327b93bf433d7d288aeeb.tar.gz ports-50513d5d5238ab12e0e327b93bf433d7d288aeeb.zip | |
Add support for DESTDIR part I.
This commit should largele be a NOOP as it only adds support
for DESTDIR undefined. This does allow us to start testing
ports with DESTDIR set, but this is as of yet not supported.
Although this has been extensively tested on pointyhat, this
is a very intrusive change and some cases may have been
overlooked. Please contact Gabor and me if you find any.
PR: 100555
Submitted by: gabor
Sponsored by: Google Summer of Code 2006
Notes
Notes:
svn path=/head/; revision=169648
Diffstat (limited to 'Mk/bsd.port.subdir.mk')
| -rw-r--r-- | Mk/bsd.port.subdir.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk index 82ba7d542b74..0ee1bce07b0b 100644 --- a/Mk/bsd.port.subdir.mk +++ b/Mk/bsd.port.subdir.mk @@ -48,10 +48,10 @@ STRIP?= -s .if !defined(NOPRECIOUSMAKEVARS) .if !defined(ARCH) -ARCH!= /usr/bin/uname -p +ARCH!= ${DESTDIR}/usr/bin/uname -p .endif .if !defined(OSREL) -OSREL!= /usr/bin/uname -r | sed -e 's/[-(].*//' +OSREL!= ${DESTDIR}/usr/bin/uname -r | sed -e 's/[-(].*//' .endif .if !defined(OSVERSION) .if exists(/sbin/sysctl) @@ -61,23 +61,23 @@ OSVERSION!= /usr/sbin/sysctl -n kern.osreldate .endif .endif .if !defined(PORTOBJFORMAT) -PORTOBJFORMAT!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout +PORTOBJFORMAT!= test -x ${DESTDIR}/usr/bin/objformat && ${DESTDIR}/usr/bin/objformat || echo aout .endif .endif -ID?= /usr/bin/id +ID?= ${DESTDIR}/usr/bin/id UID!= ${ID} -u -LOCALBASE?= ${DESTDIR}/usr/local +LOCALBASE?= ${DESTDIR}${LOCALBASE_REL} .if exists(${LOCALBASE}/sbin/pkg_info) PKG_INFO?= ${LOCALBASE}/sbin/pkg_info .else -PKG_INFO?= /usr/sbin/pkg_info +PKG_INFO?= ${DESTDIR}/usr/sbin/pkg_info .endif -SED?= /usr/bin/sed +SED?= ${DESTDIR}/usr/bin/sed PKGINSTALLVER!= ${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //' .if !defined(OPSYS) -OPSYS!= /usr/bin/uname -s +OPSYS!= ${DESTDIR}/usr/bin/uname -s .endif ECHO_MSG?= echo |