summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-02-23 23:17:30 +0000
committerjlam <jlam@pkgsrc.org>2006-02-23 23:17:30 +0000
commite60366d25b134c25fb23820b60fc1b877c2810d4 (patch)
tree7f7afc2490a38c3639877f80835f32d63237c0e9 /x11
parent79d30e1ecb6f6ee5d2bf076c5b7040734386fea1 (diff)
downloadpkgsrc-e60366d25b134c25fb23820b60fc1b877c2810d4.tar.gz
Tell the buildlink3 framework where the installed shared libraries are so
that the path isn't automatically stripped out by the wrappers.
Diffstat (limited to 'x11')
-rw-r--r--x11/XFree86-libs/buildlink3.mk3
-rw-r--r--x11/xorg-libs/buildlink3.mk5
2 files changed, 5 insertions, 3 deletions
diff --git a/x11/XFree86-libs/buildlink3.mk b/x11/XFree86-libs/buildlink3.mk
index 5519b95c678..53fcde033f6 100644
--- a/x11/XFree86-libs/buildlink3.mk
+++ b/x11/XFree86-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/02/23 23:17:30 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFREE86_LIBS_BUILDLINK3_MK:= ${XFREE86_LIBS_BUILDLINK3_MK}+
@@ -21,6 +21,7 @@ BUILDLINK_PACKAGES:= XFree86-libs ${BUILDLINK_PACKAGES}
BUILDLINK_DEPENDS.XFree86-libs+= XFree86-libs>=4.4.0
BUILDLINK_RECOMMENDED.XFree86-libs+= XFree86-libs>=4.4.0nb7
BUILDLINK_PKGSRCDIR.XFree86-libs?= ../../x11/XFree86-libs
+BUILDLINK_LIBDIRS.XFree86-libs?= ${X11ROOT_PREFIX}/lib
BUILDLINK_TRANSFORM.XFree86-libs+= -e "s|/${X11ROOT_PREFIX}/|/|"
.endif # XFREE86_LIBS_BUILDLINK3_MK
diff --git a/x11/xorg-libs/buildlink3.mk b/x11/xorg-libs/buildlink3.mk
index 7b72824243c..e1c440deebb 100644
--- a/x11/xorg-libs/buildlink3.mk
+++ b/x11/xorg-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/05 23:11:48 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/02/23 23:17:30 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XORG_LIBS_BUILDLINK3_MK:= ${XORG_LIBS_BUILDLINK3_MK}+
@@ -19,8 +19,9 @@ BUILDLINK_PACKAGES:= xorg-libs ${BUILDLINK_PACKAGES}
.if !empty(XORG_LIBS_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.xorg-libs+= xorg-libs>=6.9.0
-BUILDLINK_RECOMMENDED.xorg-libs?= xorg-libs>=6.9.0nb2
+BUILDLINK_RECOMMENDED.xorg-libs?= xorg-libs>=6.9.0nb2
BUILDLINK_PKGSRCDIR.xorg-libs?= ../../x11/xorg-libs
+BUILDLINK_LIBDIRS.xorg-libs?= ${X11ROOT_PREFIX}/lib
BUILDLINK_TRANSFORM.xorg-libs+= -e "s|/${X11ROOT_PREFIX}/|/|"
.endif # XORG_LIBS_BUILDLINK3_MK