diff options
| -rw-r--r-- | x11/Xaw-Xpm/buildlink2.mk | 8 | ||||
| -rw-r--r-- | x11/Xaw3d/buildlink2.mk | 6 | ||||
| -rw-r--r-- | x11/neXtaw/buildlink2.mk | 6 |
3 files changed, 13 insertions, 7 deletions
diff --git a/x11/Xaw-Xpm/buildlink2.mk b/x11/Xaw-Xpm/buildlink2.mk index 7c28b6e8038..152a17dfc26 100644 --- a/x11/Xaw-Xpm/buildlink2.mk +++ b/x11/Xaw-Xpm/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.3 2002/09/23 08:29:58 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.4 2003/03/03 14:22:41 seb Exp $ .if !defined(XAWXPM_BUILDLINK2_MK) XAWXPM_BUILDLINK2_MK= # defined @@ -7,6 +7,8 @@ BUILDLINK_PACKAGES+= Xaw-Xpm BUILDLINK_DEPENDS.Xaw-Xpm?= Xaw-Xpm-1.1 BUILDLINK_PKGSRCDIR.Xaw-Xpm?= ../../x11/Xaw-Xpm +.include "../../mk/bsd.prefs.mk" + EVAL_PREFIX+= BUILDLINK_PREFIX.Xaw-Xpm=Xaw-Xpm BUILDLINK_PREFIX.Xaw-Xpm_DEFAULT= ${X11PREFIX} BUILDLINK_FILES.Xaw-Xpm= include/X11/Xaw3d/* @@ -17,9 +19,9 @@ BUILDLINK_FILES.Xaw-Xpm+= lib/libXaw3d.* BUILDLINK_TARGETS+= Xaw-Xpm-buildlink LIBXAW?= -L${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ - -Wl,-R${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ + -Wl,${_OPSYS_RPATH_NAME}${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ -L${BUILDLINK_PREFIX.xpm}/lib \ - -Wl,-R${BUILDLINK_PREFIX.xpm}/lib \ + -Wl,${_OPSYS_RPATH_NAME}${BUILDLINK_PREFIX.xpm}/lib \ -lXaw3d -lXpm Xaw-Xpm-buildlink: _BUILDLINK_USE diff --git a/x11/Xaw3d/buildlink2.mk b/x11/Xaw3d/buildlink2.mk index 41205f498c1..62238b20c27 100644 --- a/x11/Xaw3d/buildlink2.mk +++ b/x11/Xaw3d/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.3 2002/09/23 08:29:59 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.4 2003/03/03 14:22:41 seb Exp $ .if !defined(XAW3D_BUILDLINK2_MK) XAW3D_BUILDLINK2_MK= # defined @@ -7,6 +7,8 @@ BUILDLINK_PACKAGES+= Xaw3d BUILDLINK_DEPENDS.Xaw3d?= Xaw3d-1.5 BUILDLINK_PKGSRCDIR.Xaw3d?= ../../x11/Xaw3d +.include "../../mk/bsd.prefs.mk" + EVAL_PREFIX+= BUILDLINK_PREFIX.Xaw3d=Xaw3d BUILDLINK_PREFIX.Xaw3d_DEFAULT= ${X11PREFIX} BUILDLINK_FILES.Xaw3d= include/X11/X11/Xaw3d/* # for OpenWindows @@ -16,7 +18,7 @@ BUILDLINK_FILES.Xaw3d+= lib/libXaw3d.* BUILDLINK_TARGETS+= Xaw3d-buildlink LIBXAW?= -L${BUILDLINK_PREFIX.Xaw3d}/lib \ - -Wl,-R${BUILDLINK_PREFIX.Xaw3d}/lib \ + -Wl,${_OPSYS_RPATH_NAME}${BUILDLINK_PREFIX.Xaw3d}/lib \ -lXaw3d Xaw3d-buildlink: _BUILDLINK_USE diff --git a/x11/neXtaw/buildlink2.mk b/x11/neXtaw/buildlink2.mk index e4eb2a0fd71..e8b23b952b7 100644 --- a/x11/neXtaw/buildlink2.mk +++ b/x11/neXtaw/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/09/23 08:29:59 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2003/03/03 14:22:41 seb Exp $ .if !defined(NEXTAW_BUILDLINK2_MK) NEXTAW_BUILDLINK2_MK= # defined @@ -7,6 +7,8 @@ BUILDLINK_PACKAGES+= neXtaw BUILDLINK_DEPENDS.neXtaw?= neXtaw>=0.12 BUILDLINK_PKGSRCDIR.neXtaw?= ../../x11/neXtaw +.include "../../mk/bsd.prefs.mk" + EVAL_PREFIX+= BUILDLINK_PREFIX.neXtaw=neXtaw BUILDLINK_PREFIX.neXtaw_DEFAULT= ${X11PREFIX} BUILDLINK_FILES.neXtaw+= include/X11/neXtaw/* @@ -15,7 +17,7 @@ BUILDLINK_FILES.neXtaw+= lib/libneXtaw.* BUILDLINK_TARGETS+= neXtaw-buildlink LIBXAW?= -L${BUILDLINK_PREFIX.neXtaw}/lib \ - -Wl,-R${BUILDLINK_PREFIX.neXtaw}/lib \ + -Wl,${_OPSYS_RPATH_NAME}${BUILDLINK_PREFIX.neXtaw}/lib \ -lneXtaw neXtaw-buildlink: _BUILDLINK_USE |