From 398f291d43e7cc0bedbd5a1382337f209ae5d42f Mon Sep 17 00:00:00 2001
From: hubertf <hubertf>
Date: Sun, 8 Mar 1998 14:55:04 +0000
Subject: Make definition of OBJMACHINE in mk.conf work.

---
 mk/bsd.pkg.mk  | 45 +++++++++++++++++++++++----------------------
 mk/bsd.port.mk | 45 +++++++++++++++++++++++----------------------
 2 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 3a15eb551b1..41888f31060 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,7 +1,7 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4
 #
-#	$NetBSD: bsd.pkg.mk,v 1.56 1998/03/08 14:25:52 frueauf Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.57 1998/03/08 14:55:04 hubertf Exp $
 #
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
 #	This file is in the public domain.
@@ -367,27 +367,6 @@ DISTDIR?=		${PORTSDIR}/distfiles
 _DISTDIR?=		${DISTDIR}/${DIST_SUBDIR}
 PACKAGES?=		${PORTSDIR}/packages
 TEMPLATES?=		${PORTSDIR}/templates
-.if !defined(NO_WRKDIR)
-.if defined(OBJMACHINE)
-WRKDIR?=		${.CURDIR}/work.${MACHINE_ARCH}
-.else
-WRKDIR?=		${.CURDIR}/work
-.endif
-.else
-WRKDIR?=		${.CURDIR}
-.endif
-.if defined(NO_WRKSUBDIR)
-WRKSRC?=		${WRKDIR}
-.else
-WRKSRC?=		${WRKDIR}/${DISTNAME}
-.endif
-
-.if defined(WRKOBJDIR)
-# XXX Is pwd -P available in FreeBSD's /bin/sh?
-__canonical_PORTSDIR!=	cd ${PORTSDIR}; pwd -P
-__canonical_CURDIR!=	cd ${.CURDIR}; pwd -P
-PORTSUBDIR=		${__canonical_CURDIR:S,${__canonical_PORTSDIR}/,,}
-.endif
 
 .if exists(${.CURDIR}/patches.${ARCH}-${OPSYS})
 PATCHDIR?=		${.CURDIR}/patches.${ARCH}-${OPSYS}
@@ -559,6 +538,28 @@ SHAREGRP = ${DOCGRP}
 SHAREMODE = ${DOCMODE}
 .endif
 
+.if !defined(NO_WRKDIR)
+.if defined(OBJMACHINE)
+WRKDIR?=		${.CURDIR}/work.${MACHINE_ARCH}
+.else
+WRKDIR?=		${.CURDIR}/work
+.endif
+.else
+WRKDIR?=		${.CURDIR}
+.endif
+.if defined(NO_WRKSUBDIR)
+WRKSRC?=		${WRKDIR}
+.else
+WRKSRC?=		${WRKDIR}/${DISTNAME}
+.endif
+
+.if defined(WRKOBJDIR)
+# XXX Is pwd -P available in FreeBSD's /bin/sh?
+__canonical_PORTSDIR!=	cd ${PORTSDIR}; pwd -P
+__canonical_CURDIR!=	cd ${.CURDIR}; pwd -P
+PORTSUBDIR=		${__canonical_CURDIR:S,${__canonical_PORTSDIR}/,,}
+.endif
+
 # A few aliases for *-install targets
 INSTALL_PROGRAM= \
 	${INSTALL} ${COPY} ${STRIPFLAG} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
diff --git a/mk/bsd.port.mk b/mk/bsd.port.mk
index 85bd663c7db..1f53dd02c76 100644
--- a/mk/bsd.port.mk
+++ b/mk/bsd.port.mk
@@ -1,7 +1,7 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4
 #
-#	$NetBSD: bsd.port.mk,v 1.56 1998/03/08 14:25:52 frueauf Exp $
+#	$NetBSD: bsd.port.mk,v 1.57 1998/03/08 14:55:04 hubertf Exp $
 #
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
 #	This file is in the public domain.
@@ -367,27 +367,6 @@ DISTDIR?=		${PORTSDIR}/distfiles
 _DISTDIR?=		${DISTDIR}/${DIST_SUBDIR}
 PACKAGES?=		${PORTSDIR}/packages
 TEMPLATES?=		${PORTSDIR}/templates
-.if !defined(NO_WRKDIR)
-.if defined(OBJMACHINE)
-WRKDIR?=		${.CURDIR}/work.${MACHINE_ARCH}
-.else
-WRKDIR?=		${.CURDIR}/work
-.endif
-.else
-WRKDIR?=		${.CURDIR}
-.endif
-.if defined(NO_WRKSUBDIR)
-WRKSRC?=		${WRKDIR}
-.else
-WRKSRC?=		${WRKDIR}/${DISTNAME}
-.endif
-
-.if defined(WRKOBJDIR)
-# XXX Is pwd -P available in FreeBSD's /bin/sh?
-__canonical_PORTSDIR!=	cd ${PORTSDIR}; pwd -P
-__canonical_CURDIR!=	cd ${.CURDIR}; pwd -P
-PORTSUBDIR=		${__canonical_CURDIR:S,${__canonical_PORTSDIR}/,,}
-.endif
 
 .if exists(${.CURDIR}/patches.${ARCH}-${OPSYS})
 PATCHDIR?=		${.CURDIR}/patches.${ARCH}-${OPSYS}
@@ -559,6 +538,28 @@ SHAREGRP = ${DOCGRP}
 SHAREMODE = ${DOCMODE}
 .endif
 
+.if !defined(NO_WRKDIR)
+.if defined(OBJMACHINE)
+WRKDIR?=		${.CURDIR}/work.${MACHINE_ARCH}
+.else
+WRKDIR?=		${.CURDIR}/work
+.endif
+.else
+WRKDIR?=		${.CURDIR}
+.endif
+.if defined(NO_WRKSUBDIR)
+WRKSRC?=		${WRKDIR}
+.else
+WRKSRC?=		${WRKDIR}/${DISTNAME}
+.endif
+
+.if defined(WRKOBJDIR)
+# XXX Is pwd -P available in FreeBSD's /bin/sh?
+__canonical_PORTSDIR!=	cd ${PORTSDIR}; pwd -P
+__canonical_CURDIR!=	cd ${.CURDIR}; pwd -P
+PORTSUBDIR=		${__canonical_CURDIR:S,${__canonical_PORTSDIR}/,,}
+.endif
+
 # A few aliases for *-install targets
 INSTALL_PROGRAM= \
 	${INSTALL} ${COPY} ${STRIPFLAG} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
-- 
cgit v1.2.3