diff options
| author | jschauma <jschauma> | 2002-12-23 22:50:29 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2002-12-23 22:50:29 +0000 |
| commit | 5c7558efbe93ff23fa290b7e27e00a88e6820305 (patch) | |
| tree | 298d82e0ca2a201404c54c6c408464eb16e370df /mk/motif.buildlink2.mk | |
| parent | e7692238d6a840fc659c5f82713eb1f08a2c91c7 (diff) | |
| download | pkgsrc-5c7558efbe93ff23fa290b7e27e00a88e6820305.tar.gz | |
Don't test for OPSYS to set rpath et al, but rather use _OPSYS_RPATH_NAME.
Suggested by Stoned Elipot. Thanks.
Diffstat (limited to 'mk/motif.buildlink2.mk')
| -rw-r--r-- | mk/motif.buildlink2.mk | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/mk/motif.buildlink2.mk b/mk/motif.buildlink2.mk index 1603f274624..15accf14223 100644 --- a/mk/motif.buildlink2.mk +++ b/mk/motif.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: motif.buildlink2.mk,v 1.5 2002/12/23 22:33:14 jschauma Exp $ +# $NetBSD: motif.buildlink2.mk,v 1.6 2002/12/23 22:50:29 jschauma Exp $ # # USE_MOTIF12 # use a Motif-1.2-compatible installation, otherwise, assume @@ -150,12 +150,7 @@ MOTIFBASE= ${_MOTIFBASE} USE_X11?= # defined MAKE_ENV+= MOTIFLIB="${MOTIFLIB}" MAKE_ENV+= MOTIFBASE="${_MOTIFBASE}" -.if ${OPSYS} == "IRIX" -LDFLAGS+= -Wl,-rpath -Wl,${_MOTIFBASE}/lib -MOTIFLIB?= -Wl,-rpath,${_MOTIFBASE}/lib -Wl,-rpath,${X11BASE}/lib -L${_MOTIFBASE}/lib -lXm -lXp -.else -LDFLAGS+= -Wl,-R${_MOTIFBASE}/lib -MOTIFLIB?= -Wl,-R${_MOTIFBASE}/lib -Wl,-R${X11BASE}/lib -L${_MOTIFBASE}/lib -lXm -lXp -.endif +LDFLAGS+= -Wl,${_OPSYS_RPATH_NAME}${_MOTIFBASE}/lib +MOTIFLIB?= -Wl,${_OPSYS_RPATH_NAME}${_MOTIFBASE}/lib -L${_MOTIFBASE}/lib -lXm -lXp .endif # MOTIF_BUILDLINK2_MK |