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 /pkgtools | |
| 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 'pkgtools')
| -rw-r--r-- | pkgtools/xpkgwedge/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile index 84b478e6b33..60819a279a0 100644 --- a/pkgtools/xpkgwedge/Makefile +++ b/pkgtools/xpkgwedge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2004/07/31 01:42:06 xtraeme Exp $ +# $NetBSD: Makefile,v 1.53 2004/08/27 06:29:10 jlam Exp $ DISTNAME= xpkgwedge-1.12 CATEGORIES= pkgtools devel x11 @@ -50,8 +50,7 @@ do-build: .if defined(X11_TYPE) && !empty(X11_TYPE:Mxorg) || \ defined(X11_TYPE) && !empty(X11_TYPE:MXFree86) -X11TYPEFLAGS?= -L${X11BASE}/lib \ - ${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib +X11TYPEFLAGS?= -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib SUBST_CLASSES= fix SUBST_STAGE.fix= post-patch SUBST_FILES.fix= xpkgwedge.def |