summaryrefslogtreecommitdiff
path: root/mk/xaw.buildlink2.mk
diff options
context:
space:
mode:
authorjlam <jlam>2002-09-23 08:29:56 +0000
committerjlam <jlam>2002-09-23 08:29:56 +0000
commit0751d0eff1512c05e2cd09eab6eb630899a3c0c2 (patch)
tree5c9a74d1e3088bf4e7a7b2cc4cefa420b421d5c4 /mk/xaw.buildlink2.mk
parent14e419b4822c77648abaefe0ff750ba0af852d06 (diff)
downloadpkgsrc-0751d0eff1512c05e2cd09eab6eb630899a3c0c2.tar.gz
Add the -Wl,-R flags to find the widget library. The ld wrapper script
understands "-Wl,-R" to be just "-R", so it will work fine.
Diffstat (limited to 'mk/xaw.buildlink2.mk')
-rw-r--r--mk/xaw.buildlink2.mk15
1 files changed, 10 insertions, 5 deletions
diff --git a/mk/xaw.buildlink2.mk b/mk/xaw.buildlink2.mk
index 7ede0a4fc64..ed064c742bc 100644
--- a/mk/xaw.buildlink2.mk
+++ b/mk/xaw.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xaw.buildlink2.mk,v 1.3 2002/08/28 15:20:39 jlam Exp $
+# $NetBSD: xaw.buildlink2.mk,v 1.4 2002/09/23 08:29:56 jlam Exp $
.if !defined(XAW_BUILDLINK2_MK)
XAW_BUILDLINK2_MK= # defined
@@ -9,14 +9,19 @@ XAW_TYPE?= standard
.include "../../mk/bsd.prefs.mk"
.if ${XAW_TYPE} == "xpm"
-.include "../../x11/Xaw-Xpm/buildlink2.mk"
+. include "../../x11/Xaw-Xpm/buildlink2.mk"
+BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.Xaw-Xpm}
.elif ${XAW_TYPE} == "3d"
-.include "../../x11/Xaw3d/buildlink2.mk"
+. include "../../x11/Xaw3d/buildlink2.mk"
+BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.Xaw3d}
.elif ${XAW_TYPE} == "neXtaw"
-.include "../../x11/neXtaw/buildlink2.mk"
+. include "../../x11/neXtaw/buildlink2.mk"
+BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.neXtaw}
.else
-LIBXAW?= -L${X11BASE}/lib -lXaw
+BUILDLINK_PREFIX.Xaw?= ${X11BASE}
+LIBXAW?= -L${X11BASE}/lib -Wl,-R${X11BASE} -lXaw
.endif
+
MAKE_ENV+= LIBXAW="${LIBXAW}"
.endif # XAW_BUILDLINK2_MK