diff options
| -rw-r--r-- | mk/bsd.pkg.defaults.mk | 11 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
2 files changed, 14 insertions, 3 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index 9a0fd81b38c..695b742699b 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.defaults.mk,v 1.74 2002/07/23 19:10:27 cjep Exp $ +# $NetBSD: bsd.pkg.defaults.mk,v 1.75 2002/07/29 07:25:38 grant Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -22,7 +22,14 @@ #OBJHOSTNAME= # use hostname-specific object directories, e.g. work.amnesiac, work.localhost -# OBJHOSTNAME takes precedence over OBJMACHINE (see below). +# OBJHOSTNAME takes precedence over OBJOSMACHINE and OBJMACHINE (see below). +# Possible: defined, not defined +# Default: not defined + +#OBJOSMACHINE= +# use the OS name, version and machine type for object directories, +# e.g. NetBSD-1.5-i386, SunOS-5.7-sparc +# OBJOSMACHINE takes precedence over OBJMACHINE (see below). # Possible: defined, not defined # Default: not defined diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 752ea42fe4e..5d04e153f1f 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1016 2002/07/28 12:51:07 schmonz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1017 2002/07/29 07:25:38 grant Exp $ # # This file is in the public domain. # @@ -491,6 +491,8 @@ BUILD_DIR?= ${.CURDIR} .endif # WRKOBJDIR # If OBJHOSTNAME is set, use first component of hostname in directory name +# If OBJOSMACHINE is set, use ${OPSYS}-${OS_VERSION}-${MACHINE_ARCH} in +# working directory name # If OBJMACHINE is set, use ${MACHINE_ARCH} in the working directory name .if defined(OBJHOSTNAME) . if !defined(_HOSTNAME) @@ -498,6 +500,8 @@ _HOSTNAME!= ${UNAME} -n MAKEFLAGS+= _HOSTNAME=${_HOSTNAME} . endif WRKDIR_BASENAME?= work.${_HOSTNAME:C|\..*||} +.elif defined(OBJOSMACHINE) +WRKDIR_BASENAME?= work.${OPSYS}-${OS_VERSION}-${MACHINE_ARCH} .elif defined(OBJMACHINE) WRKDIR_BASENAME?= work.${MACHINE_ARCH} .else |