[src/trunk]: src/share/mk Fixed handling of MAKEOBJDIR so that it matches mak...

[sjg <sjg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1163877356cb
branches:  trunk
changeset: 481867:1163877356cb
user:      sjg <sjg%NetBSD.org@localhost>
date:      Tue Feb 08 12:38:16 2000 +0000

description:
Fixed handling of MAKEOBJDIR so that it matches make(1)'s expectations.
Added handling of MAKEOBJDIRPREFIX.
In both cases we simply need to mkdir the appropriate path if it does not
exists.

diffstat:

 share/mk/bsd.obj.mk |  27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r 0e37903a9c4b -r 1163877356cb share/mk/bsd.obj.mk
--- a/share/mk/bsd.obj.mk       Tue Feb 08 12:17:43 2000 +0000
+++ b/share/mk/bsd.obj.mk       Tue Feb 08 12:38:16 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.obj.mk,v 1.22 1999/12/04 02:44:07 sommerfeld Exp $
+#      $NetBSD: bsd.obj.mk,v 1.23 2000/02/08 12:38:16 sjg Exp $
 
 .if !target(__initialized_obj__)
 __initialized_obj__:
@@ -8,10 +8,26 @@
 .if ${MKOBJ} == "no"
 obj:
 .else
-
-.if defined(MAKEOBJDIR)
-__objdir=      ${MAKEOBJDIR}
-.elif defined(OBJMACHINE)
+.if defined(MAKEOBJDIRPREFIX) || defined(MAKOBJDIR)
+.if defined(MAKEOBJDIRPREFIX)
+__objdir:= ${MAKEOBJDIRPREFIX}${.CURDIR}
+.else
+__objdir:= ${MAKEOBJDIR}
+.endif
+# MAKEOBJDIR and MAKEOBJDIRPREFIX are env variables supported
+# by make(1).  We simply mkdir -p the specified path.
+# If that fails - we do a mkdir to get the appropriate error message
+# before bailing out.
+obj:
+       @if ! test -d ${__objdir}; then \
+               mkdir -p ${__objdir}; \
+               if ! test -d ${__objdir}; then \
+                       mkdir ${__objdir}; exit 1; \
+               fi; \
+               echo "${.CURDIR} -> ${__objdir}"; \
+       fi
+.else
+.if defined(OBJMACHINE)
 __objdir=      obj.${MACHINE}
 .else
 __objdir=      obj
@@ -65,6 +81,7 @@
                fi ; \
        fi;
 .endif
+.endif
 
 print-objdir:
        @echo ${.OBJDIR}