summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-07-02 21:11:46 +0000
committerjlam <jlam@pkgsrc.org>2001-07-02 21:11:46 +0000
commit79c0d4b4c89bd3cb720b40d8325ef1c8c685150f (patch)
tree708ad6cbea3486df4d96e273d06f743933db2f13
parentfa76f1663072b49467346e3369bfa9311065e4c5 (diff)
downloadpkgsrc-79c0d4b4c89bd3cb720b40d8325ef1c8c685150f.tar.gz
Don't pass -L${X11BASE}/lib in MOTIFLIB if USE_BUILDLINK_X11 is defined.
-rw-r--r--x11/lesstif/buildlink.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/x11/lesstif/buildlink.mk b/x11/lesstif/buildlink.mk
index 37cc56df8c8..28429b126d4 100644
--- a/x11/lesstif/buildlink.mk
+++ b/x11/lesstif/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:33 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/02 21:11:46 jlam Exp $
#
# This Makefile fragment is included by packages that use lesstif.
#
@@ -64,7 +64,11 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.lesstif}
USE_X11= # defined
MAKE_ENV+= MOTIFLIB="${MOTIFLIB}"
LDFLAGS+= -Wl,-R${MOTIFBASE}/lib
+.if defined(USE_BUILDLINK_X11)
+MOTIFLIB?= -Wl,-R${MOTIFBASE}/lib -Wl,-R${X11BASE}/lib -L${BUILDLINK_DIR}/lib -lXm -lXp
+.else
MOTIFLIB?= -Wl,-R${MOTIFBASE}/lib -Wl,-R${X11BASE}/lib -L${BUILDLINK_DIR}/lib -L${X11BASE}/lib -lXm -lXp
+.endif
pre-configure: ${BUILDLINK_TARGETS.lesstif}
lesstif-buildlink: _BUILDLINK_USE