diff options
author | seb <seb@pkgsrc.org> | 2003-03-03 14:22:41 +0000 |
---|---|---|
committer | seb <seb@pkgsrc.org> | 2003-03-03 14:22:41 +0000 |
commit | 00e799491cdc6a967d8777e1a37d6344e0ec92d6 (patch) | |
tree | 655724c0b0b51cb71036a5f7de38c8d122c115e3 /x11/Xaw-Xpm | |
parent | 50db9b5c80cefb216753e3876ebb8609fd0220e3 (diff) | |
download | pkgsrc-00e799491cdc6a967d8777e1a37d6344e0ec92d6.tar.gz |
Use ${_OPSYS_RPATH_NAME} instead of bare `-R'
Diffstat (limited to 'x11/Xaw-Xpm')
-rw-r--r-- | x11/Xaw-Xpm/buildlink2.mk | 8 |
1 files changed, 5 insertions, 3 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 |