Always use LOCALBASE setting from mk/defaults/mk.conf.

Setting it with ?= in the platform files is a nop anyway.

5 files changed, 5 insertions, 14 deletions

diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index 9388149208c..56c787da790 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.21 2006/09/18 15:11:37 tron Exp $
+# $NetBSD: Darwin.mk,v 1.22 2006/10/06 14:28:46 joerg Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -81,8 +81,6 @@ _OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-Wl,-x} # cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
-LOCALBASE?=		${DESTDIR}/usr/pkg
-
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD=	/usr/sbin/sysctl -n kern.argmax
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index 907a07e0bed..24c124181e9 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.27 2006/09/10 13:44:58 schwarz Exp $
+# $NetBSD: IRIX.mk,v 1.28 2006/10/06 14:28:46 joerg Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -98,7 +98,6 @@ _INCOMPAT_ICONV=	IRIX-*-*
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-S -f}	# install(1) option to strip
 
-LOCALBASE?=		${DESTDIR}/usr/pkg
 PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
 
 CONFIGURE_ENV+=		ABI=${ABI:Q}
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index d1ecef373c2..e6977cd3d22 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.25 2006/07/20 20:02:23 jlam Exp $
+# $NetBSD: Linux.mk,v 1.26 2006/10/06 14:28:46 joerg Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -72,8 +72,6 @@ _OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
-LOCALBASE?=		${DESTDIR}/usr/pkg
-
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index 9a5df2fa64c..4d00f2b82b2 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.26 2006/07/20 20:02:23 jlam Exp $
+# $NetBSD: SunOS.mk,v 1.27 2006/10/06 14:28:46 joerg Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -90,8 +90,6 @@ _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 	@false
 .endif
 
-LOCALBASE?=		${DESTDIR}/usr/pkg
-
 .if exists(${LOCALBASE}/sbin/pkg_info)
 PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
 .else
diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index 02ec471d167..de6c3127b33 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.22 2006/07/20 20:02:23 jlam Exp $
+# $NetBSD: UnixWare.mk,v 1.23 2006/10/06 14:28:46 joerg Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -75,8 +75,6 @@ _INCOMPAT_ICONV=	UnixWare-*-*
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U}	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U}	# install(1) option to strip
 
-LOCALBASE?=		${DESTDIR}/usr/pkg
-
 PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
 
 # check for maximum command line length and set it in configure's environment,