diff options
author | jlam <jlam> | 2003-01-15 20:55:38 +0000 |
---|---|---|
committer | jlam <jlam> | 2003-01-15 20:55:38 +0000 |
commit | b8da8b24cd000c1b9bfda1bf3ea0579866b75dd8 (patch) | |
tree | 67586206e121ed2b712b9edffb53000a2d7e5b20 /mk/bsd.prefs.mk | |
parent | 28ba019768408e6b306a901c9c1ede2e148e7078 (diff) | |
download | pkgsrc-b8da8b24cd000c1b9bfda1bf3ea0579866b75dd8.tar.gz |
Make BUILD_DIR always point to a physical path by invoking /bin/pwd instead
of relying on the shell's builtin pwd. This makes BUILD_DIR consistently
point to the correct directory regardless of the definition of SHELL. This
fixes elusive some buildlink2 errors due to the fact that BUILDLINK_DIR is
derived from BUILD_DIR and some paths were incorrectly being translated.
Diffstat (limited to 'mk/bsd.prefs.mk')
-rw-r--r-- | mk/bsd.prefs.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index f288a6b6ff3..1ee11dd5fb4 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.104 2003/01/15 10:06:48 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.105 2003/01/15 20:55:39 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -295,8 +295,8 @@ PKGDIR?= ${.CURDIR} .if defined(WRKOBJDIR) BUILD_DIR?= ${WRKOBJDIR}/${PKGPATH} .else -BUILD_DIR?= ${.CURDIR} -.endif # WRKOBJDIR +BUILD_DIR!= cd ${.CURDIR} && ${PWD_CMD} +.endif # If OBJHOSTNAME is set, use first component of hostname in directory name. # If OBJMACHINE is set, use ${MACHINE_ARCH} in the working directory name. |