summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam>2001-07-18 22:44:30 +0000
committerjlam <jlam>2001-07-18 22:44:30 +0000
commitbb20253b89a7cb1b52d1e8584908055f2545a50b (patch)
tree7b92b9fbb5249332384a95ccefc7fe7f04fe6467 /x11
parentb3772ed45ab975b3aded8f55470035051692e100 (diff)
downloadpkgsrc-bb20253b89a7cb1b52d1e8584908055f2545a50b.tar.gz
Add -Wl,-R${X11BASE}/lib to USER_LDFLAGS to head of possible problems when
libraries move from pkgsrc into the main X11 distribution.
Diffstat (limited to 'x11')
-rw-r--r--x11/kdebase2/Makefile6
-rw-r--r--x11/kdelibs2/Makefile6
2 files changed, 8 insertions, 4 deletions
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index cca1a10a8ca..7d560cc7417 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/07/16 11:02:01 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2001/07/18 22:44:30 jlam Exp $
DISTNAME= kdebase-2.1
CATEGORIES= x11 kde
@@ -22,7 +22,9 @@ 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
+USER_LDFLAGS= -L${BUILDLINK_DIR}/lib
+USER_LDFLAGS+= -Wl,-R${LOCALBASE}/lib
+USER_LDFLAGS+= -Wl,-R${X11BASE}/lib
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
IMAKEDIR= ${WRKDIR}/imake
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index e3c79ae14dc..dee4f574dfa 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/07/14 05:12:10 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/07/18 22:44:30 jlam Exp $
#
DISTNAME= kdelibs-2.1
@@ -23,7 +23,9 @@ LTCONFIG_OVERRIDE+= ${WRKSRC}/ksgmltools/ltconfig
CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_DIR}"
CONFIGURE_ENV+= USER_LDFLAGS="${USER_LDFLAGS}"
LIBS+= -Wl,--export-dynamic
-USER_LDFLAGS= -L${BUILDLINK_DIR}/lib -Wl,-R${LOCALBASE}/lib
+USER_LDFLAGS= -L${BUILDLINK_DIR}/lib
+USER_LDFLAGS+= -Wl,-R${LOCALBASE}/lib
+USER_LDFLAGS+= -Wl,-R${X11BASE}/lib
MKDIRS= share/kde/icons/locolor/32x32/actions/kde \
share/kde/icons/locolor/22x22/mimetypes \