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 /shells | |
| 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 'shells')
| -rw-r--r-- | shells/zsh/Makefile.common | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common index 8b2a389a920..2c04ca1b9bf 100644 --- a/shells/zsh/Makefile.common +++ b/shells/zsh/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16 2004/08/20 16:59:58 tron Exp $ +# $NetBSD: Makefile.common,v 1.17 2004/08/27 06:29:10 jlam Exp $ DISTNAME= zsh-${ZSH_VERSION} CATEGORIES= shells @@ -53,7 +53,7 @@ LDFLAGS+= -static . if ${OPSYS} == "SunOS" PLIST_SRC= ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST . else -LDFLAGS+= -Wl,${RPATH_FLAG}${PREFIX}/lib/zsh +LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/zsh PLIST_SRC= ${PKGDIR}/PLIST.shlibs ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST . endif .endif |