diff options
| author | grant <grant> | 2002-07-30 00:09:23 +0000 |
|---|---|---|
| committer | grant <grant> | 2002-07-30 00:09:23 +0000 |
| commit | 48ee3efe6bd9db601ee44ef3f8b47939d19231fb (patch) | |
| tree | 1d59ef4b70745d4de22ab2734ef69fbcb90c2b9e /mk | |
| parent | d76635378abb2963196a79552fddf17aea0260cc (diff) | |
| download | pkgsrc-48ee3efe6bd9db601ee44ef3f8b47939d19231fb.tar.gz | |
back out OBJOSMACHINE stuff as it is superfluous. pointed out by
jlam.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.defaults.mk | 11 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
2 files changed, 3 insertions, 14 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index 695b742699b..31cd060d434 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.defaults.mk,v 1.75 2002/07/29 07:25:38 grant Exp $ +# $NetBSD: bsd.pkg.defaults.mk,v 1.76 2002/07/30 00:09:23 grant Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -22,14 +22,7 @@ #OBJHOSTNAME= # use hostname-specific object directories, e.g. work.amnesiac, work.localhost -# 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). +# OBJHOSTNAME 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 f65be1f77b9..54d37f22cac 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1020 2002/07/29 22:15:02 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1021 2002/07/30 00:09:23 grant Exp $ # # This file is in the public domain. # @@ -491,8 +491,6 @@ 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) @@ -500,8 +498,6 @@ _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 |