Module Name: src
Committed By: christos
Date: Thu Dec 8 03:25:35 UTC 2016
Modified Files:
src/share/mk: bsd.obj.mk
Log Message:
factor out expression.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/share/mk/bsd.obj.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.obj.mk
diff -u src/share/mk/bsd.obj.mk:1.49 src/share/mk/bsd.obj.mk:1.50
--- src/share/mk/bsd.obj.mk:1.49 Sun Jan 24 19:43:00 2010
+++ src/share/mk/bsd.obj.mk Wed Dec 7 22:25:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.obj.mk,v 1.49 2010/01/25 00:43:00 christos Exp $
+# $NetBSD: bsd.obj.mk,v 1.50 2016/12/08 03:25:35 christos Exp $
.if !defined(_BSD_OBJ_MK_)
_BSD_OBJ_MK_=1
@@ -37,10 +37,11 @@ obj:
.else
PAWD?= /bin/pwd
-__objdir= obj${OBJMACHINE:D.${MACHINE}}
+__objdirsuffix= ${OBJMACHINE:D.${MACHINE}}
+__objdir= obj${__objdirsuffix}
__usrobjdir= ${BSDOBJDIR}${USR_OBJMACHINE:D.${MACHINE}}
-__usrobjdirpf= ${USR_OBJMACHINE:D:U${OBJMACHINE:D.${MACHINE}}}
+__usrobjdirpf= ${USR_OBJMACHINE:D:U${__objdirsuffix}}
.if defined(BUILDID)
__objdir:= ${__objdir}.${BUILDID}
