diff options
| author | mycroft <mycroft@pkgsrc.org> | 2000-06-03 19:10:48 +0000 |
|---|---|---|
| committer | mycroft <mycroft@pkgsrc.org> | 2000-06-03 19:10:48 +0000 |
| commit | 28d6c5223db86085b083a045684a59508016d0e0 (patch) | |
| tree | d8d4952d4b4020f613610cef150843616ac1ecea /mk | |
| parent | 01fc7c344a68b747f5d6e4b8e6fc6ce3191df7c2 (diff) | |
| download | pkgsrc-28d6c5223db86085b083a045684a59508016d0e0.tar.gz | |
The __canonical_* stuff for WRKOBJDIR is unnecessary. Just use PKGPATH to
derive the work directory. No more !=s in recursive make(1)s.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index e7c35851871..ea42c69de1a 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.460 2000/06/03 19:03:20 mycroft Exp $ +# $NetBSD: bsd.pkg.mk,v 1.461 2000/06/03 19:10:48 mycroft Exp $ # # This file is in the public domain. # @@ -345,15 +345,8 @@ _PKG_DEBUG= set -x; # If WRKOBJDIR is set, use that tree to build .ifdef WRKOBJDIR -. if !defined(__canonical_PKGSRCDIR) -__canonical_PKGSRCDIR!= cd ${PKGSRCDIR} && pwd -P -MAKEFLAGS+= __canonical_PKGSRCDIR=${__canonical_PKGSRCDIR} -. endif # !defined(__canonical_PKGSRCDIR) -# Cannot put this into MAKEFLAGS, as it changes: -__canonical_CURDIR!= cd ${.CURDIR} && pwd -P -PKGSRC_SUBDIR= ${__canonical_CURDIR:S,${__canonical_PKGSRCDIR}/,,} BUILD_ROOT= ${WRKOBJDIR} -BUILD_DIR?= ${WRKOBJDIR}/${PKGSRC_SUBDIR} +BUILD_DIR?= ${WRKOBJDIR}/${PKGPATH} .else BUILD_ROOT= ${PKGSRCDIR} BUILD_DIR?= ${.CURDIR} |