From f5be50f334022eaea0cf1b1b69c7e6aa6d527d0c Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Wed, 21 Nov 2001 13:02:52 +0000
Subject: Add a _USE_RPATH definition to the individual defs.${OPSYS}.mk files,
 and use it in bsd.pkg.mk. This definition says whether or not the rpath is to
 be added to the LDFLAGS definition.

---
 mk/bsd.pkg.mk     | 4 ++--
 mk/defs.Darwin.mk | 3 ++-
 mk/defs.Linux.mk  | 3 ++-
 mk/defs.NetBSD.mk | 3 ++-
 mk/defs.SunOS.mk  | 3 ++-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index a29571ff14b..9168db99ed4 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.854 2001/11/21 12:58:15 agc Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.855 2001/11/21 13:02:52 agc Exp $
 #
 # This file is in the public domain.
 #
@@ -333,7 +333,7 @@ LDFLAGS+=		-Wl,-R${X11BASE}/lib
 LDFLAGS+=		-L${X11BASE}/lib
 .  endif
 .endif
-.if ${OPSYS} != "Darwin"
+.if ${_USE_RPATH} == "yes"
 LDFLAGS+=		-Wl,-R${LOCALBASE}/lib
 .endif
 .if !defined(USE_BUILDLINK_ONLY)
diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk
index 686b95ec3af..5f501acd160 100644
--- a/mk/defs.Darwin.mk
+++ b/mk/defs.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.7 2001/11/21 12:58:16 agc Exp $
+# $NetBSD: defs.Darwin.mk,v 1.8 2001/11/21 13:02:53 agc Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -61,3 +61,4 @@ ROOT_GROUP?=	wheel
 
 _DO_LIBINTL_CHECKS=	yes	# perform checks for valid libintl
 _IMAKE_MAKE=	${MAKE}		# program which gets invoked by imake
+_USE_RPATH=	no		# don't add rpath to LDFLAGS
diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk
index 94ef470fe87..40d1be4fe53 100644
--- a/mk/defs.Linux.mk
+++ b/mk/defs.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.13 2001/11/21 12:58:16 agc Exp $
+# $NetBSD: defs.Linux.mk,v 1.14 2001/11/21 13:02:53 agc Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -65,3 +65,4 @@ ROOT_GROUP?=	wheel
 
 _DO_LIBINTL_CHECKS=	no	# perform checks for valid libintl
 _IMAKE_MAKE=	${MAKE}		# program which gets invoked by imake
+_USE_RPATH=	yes		# add rpath to LDFLAGS
diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk
index cadb1b6d489..c95103e86bb 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/defs.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.11 2001/11/21 12:58:16 agc Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.12 2001/11/21 13:02:53 agc Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -70,3 +70,4 @@ ROOT_GROUP?=	wheel
 
 _DO_LIBINTL_CHECKS=	yes	# perform checks for valid libintl
 _IMAKE_MAKE=	${MAKE}		# program which gets invoked by imake
+_USE_RPATH=	yes		# add rpath to LDFLAGS
diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk
index 94c95087859..110494c08bf 100644
--- a/mk/defs.SunOS.mk
+++ b/mk/defs.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.10 2001/11/21 12:58:16 agc Exp $
+# $NetBSD: defs.SunOS.mk,v 1.11 2001/11/21 13:02:53 agc Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -72,3 +72,4 @@ ROOT_GROUP?=	root
 
 _DO_LIBINTL_CHECKS=	yes		# perform checks for valid libintl
 _IMAKE_MAKE=	/usr/ccs/bin/make	# program which gets invoked by imake
+_USE_RPATH=	yes			# add rpath to LDFLAGS
-- 
cgit v1.2.3