diff options
author | jlam <jlam@pkgsrc.org> | 2004-08-27 06:29:06 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2004-08-27 06:29:06 +0000 |
commit | ca7093842870728d22dde1258798b1704c53ca18 (patch) | |
tree | 0ff3b0eccc04d1b065efd866b0590608098961d5 /mk/motif.buildlink3.mk | |
parent | 49f0d0312d389247bf08d1e7c28970e1dfb7508f (diff) | |
download | pkgsrc-ca7093842870728d22dde1258798b1704c53ca18.tar.gz |
Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,
which are the full option names used to set rpath directives for the
linker and the compiler, respectively. In places were we are invoking
the linker, use "${LINKER_RPATH_FLAG} <path>", where the space is
inserted in case the flag is a word, e.g. -rpath. The default values
of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the
compiler that you use. They may be overridden on a ${OPSYS}-specific
basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG,
respectively. Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.
Diffstat (limited to 'mk/motif.buildlink3.mk')
-rw-r--r-- | mk/motif.buildlink3.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/motif.buildlink3.mk b/mk/motif.buildlink3.mk index 8959c7740bd..9e36b943953 100644 --- a/mk/motif.buildlink3.mk +++ b/mk/motif.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: motif.buildlink3.mk,v 1.4 2004/06/18 11:22:41 kristerw Exp $ +# $NetBSD: motif.buildlink3.mk,v 1.5 2004/08/27 06:29:09 jlam Exp $ # # MOTIFBASE # choose the Motif-2.0 installation at the named location. @@ -84,8 +84,8 @@ MAKE_ENV+= MOTIFLIB="${MOTIFLIB}" MAKE_ENV+= MOTIFBASE="${_MOTIFBASE}" CPPFLAGS+= -I${_MOTIFBASE}/include LDFLAGS+= -L${_MOTIFBASE}/lib -LDFLAGS+= ${_COMPILER_LD_FLAG}${_OPSYS_RPATH_NAME}${_MOTIFBASE}/lib -MOTIFLIB?= ${_COMPILER_LD_FLAG}${_OPSYS_RPATH_NAME}${_MOTIFBASE}/lib \ +LDFLAGS+= ${COMPILER_RPATH_FLAG}${_MOTIFBASE}/lib +MOTIFLIB?= ${COMPILER_RPATH_FLAG}${_MOTIFBASE}/lib \ -L${_MOTIFBASE}/lib -lXm -lXp .endif # MOTIF_BUILDLINK3_MK |