diff options
| author | linimon <linimon@FreeBSD.org> | 2006-08-17 15:12:56 +0800 |
|---|---|---|
| committer | linimon <linimon@FreeBSD.org> | 2006-08-17 15:12:56 +0800 |
| commit | ce14cede893705cbeda2390d6e0c66e2ca88272d (patch) | |
| tree | 479030a29a2f0fade3662ae5b4794b7ff9b0dd89 /devel | |
| parent | 6de4412adb066ad51dc598ebe2a6107cd945a38d (diff) | |
| download | freebsd-ports-gnome-ce14cede893705cbeda2390d6e0c66e2ca88272d.tar.gz freebsd-ports-gnome-ce14cede893705cbeda2390d6e0c66e2ca88272d.tar.zst freebsd-ports-gnome-ce14cede893705cbeda2390d6e0c66e2ca88272d.zip | |
Catch up with ports/Mk/bsd.port.subdir.mk r1.65.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/portmk/Mk/bsd.port.subdir.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/devel/portmk/Mk/bsd.port.subdir.mk b/devel/portmk/Mk/bsd.port.subdir.mk index 82ba7d542b74..0ee1bce07b0b 100644 --- a/devel/portmk/Mk/bsd.port.subdir.mk +++ b/devel/portmk/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 |