From e1fc034a8cf4df9e5e08d11a6e53ecfc8c37b31c Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sat, 14 Jul 2001 05:12:10 +0000
Subject: Add -Wl,-R${LOCALBASE}/lib to the LDFLAGS passed into the build, used
 when linking libraries and apps.

---
 x11/kdebase2/Makefile | 5 +++--
 x11/kdelibs2/Makefile | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'x11')

diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 862f811d74d..6e55151da90 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/07/08 11:28:44 zuntum Exp $
+# $NetBSD: Makefile,v 1.18 2001/07/14 05:13:42 jlam Exp $
 
 DISTNAME=	kdebase-2.1
 CATEGORIES=	x11 kde
@@ -15,13 +15,14 @@ USE_BUILDLINK_ONLY=	yes
 .include "../../x11/kde2/Makefile.part2"
 
 CONFIGURE_ENV+=		UIC="${QTDIR}/bin/uic"
-CONFIGURE_ENV+=		USER_LDFLAGS="-L${BUILDLINK_DIR}/lib"
+CONFIGURE_ENV+=		USER_LDFLAGS="${USER_LDFLAGS}"
 CONFIGURE_ARGS+=	--with-motif-includes="${BUILDLINK_DIR}/include"
 CONFIGURE_ARGS+=	--with-motif-libraries="${BUILDLINK_DIR}/lib"
 CONFIGURE_ARGS+=	--with-ssl-dir="${BUILDLINK_DIR}"
 CONFIGURE_ARGS+=	--disable-greet-lib
 CONFIGURE_ARGS+=	--without-pam
 LIBS+=			-Wl,--export-dynamic
+USER_LDFLAGS=		-L${BUILDLINK_DIR}/lib -Wl,-R${LOCALBASE}/lib
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 IMAKEDIR=	${WRKDIR}/imake
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 5d542d85aec..e3c79ae14dc 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/07/09 16:48:39 skrll Exp $
+# $NetBSD: Makefile,v 1.12 2001/07/14 05:12:10 jlam Exp $
 #
 
 DISTNAME=	kdelibs-2.1
@@ -21,8 +21,9 @@ LTCONFIG_OVERRIDE+=	${WRKSRC}/ksgmltools/ltconfig
 .endif
 
 CONFIGURE_ARGS+=	--with-ssl-dir="${BUILDLINK_DIR}"
-CONFIGURE_ENV+=		USER_LDFLAGS="-L${BUILDLINK_DIR}/lib"
+CONFIGURE_ENV+=		USER_LDFLAGS="${USER_LDFLAGS}"
 LIBS+=			-Wl,--export-dynamic
+USER_LDFLAGS=		-L${BUILDLINK_DIR}/lib -Wl,-R${LOCALBASE}/lib
 
 MKDIRS=	share/kde/icons/locolor/32x32/actions/kde \
 	share/kde/icons/locolor/22x22/mimetypes \
-- 
cgit v1.2.3