From 3ad1fec0e7709211895bceae187351afa8d558c1 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 1 Oct 2001 17:14:40 +0000
Subject: Have x11.buildlink.mk add -Wl,-R${X11BASE}/lib to LDFLAGS directly,
 instead of relying on bsd.pkg.mk to do it.  This change just makes
 x11.buildlink.mk more self-sufficient.  Also add a warning that
 x11.buildlink.mk shouldn't be included in any buildlink.mk files since what
 it appends to *_POST_SED variables must come last.

---
 mk/bsd.pkg.mk       | 6 +++---
 mk/x11.buildlink.mk | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'mk')

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 45b8e28396f..cfc4c32bf65 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.816 2001/09/30 22:10:34 abs Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.817 2001/10/01 17:14:40 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -308,9 +308,9 @@ DISTINFO_FILE?=		${.CURDIR}/distinfo
 M4?=			/usr/bin/m4
 .endif
 
-.if defined(USE_X11BASE) || defined(USE_X11)
+.if !defined(X11_BUILDLINK_MK)
+.  if defined(USE_X11BASE) || defined(USE_X11)
 LDFLAGS+=		-Wl,-R${X11BASE}/lib
-.  if !defined(X11_BUILDLINK_MK)
 LDFLAGS+=		-L${X11BASE}/lib
 .  endif
 .endif
diff --git a/mk/x11.buildlink.mk b/mk/x11.buildlink.mk
index 97e501fdb5e..47d98249fab 100644
--- a/mk/x11.buildlink.mk
+++ b/mk/x11.buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: x11.buildlink.mk,v 1.2 2001/09/25 23:49:57 jlam Exp $
+# $NetBSD: x11.buildlink.mk,v 1.3 2001/10/01 17:14:40 jlam Exp $
 #
 # This Makefile fragment is included by packages that use X11.
 #
@@ -9,6 +9,7 @@
 # (2) Include this Makefile fragment in the package Makefile.
 #
 # NOTE: This file must be included _before_ bsd.pkg.mk.
+# NOTE: This file should _not_ be included in any package's buildlink.mk file.
 
 .if !defined(X11_BUILDLINK_MK)
 X11_BUILDLINK_MK=	# defined
@@ -26,7 +27,7 @@ CONFIGURE_ENV+=		BUILDLINK_X11_DIR="${BUILDLINK_X11_DIR}"
 MAKE_ENV+=		BUILDLINK_X11_DIR="${BUILDLINK_X11_DIR}"
 
 BUILDLINK_X11_CPPFLAGS=	-I${BUILDLINK_X11_DIR}/include
-BUILDLINK_X11_LDFLAGS=	-L${BUILDLINK_X11_DIR}/lib
+BUILDLINK_X11_LDFLAGS=	-L${BUILDLINK_X11_DIR}/lib -Wl,-R${X11BASE}/lib
 
 # We just append to these values, as there's no need for the BUILDLINK_X11
 # flags to be listed in the beginning; these are just the X11R6 headers and
-- 
cgit v1.2.3