diff options
| author | jlam <jlam@pkgsrc.org> | 2003-03-14 19:37:30 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-03-14 19:37:30 +0000 |
| commit | 3ef633718c6eecbd852195de9329d45632a10352 (patch) | |
| tree | 4ee2e06249d68477cf3fb68be1f095453bcec90d /wm | |
| parent | 1940384395085677c2036358dfcccfad791a4dd8 (diff) | |
| download | pkgsrc-3ef633718c6eecbd852195de9329d45632a10352.tar.gz | |
(1) Publicly export the value of _OPSYS_RPATH_NAME as RPATH_FLAG;
Makefiles simply need to use this value often, for better or for
worse.
(2) Create a new variable FIX_RPATH that lists variables that should
be cleansed of -R or -rpath values if ${_USE_RPATH} is "no". By
default, FIX_RPATH contains LIBS, X11_LDFLAGS, and LDFLAGS, and
additional variables may be appended from package Makefiles.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/amiwm/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/wm/amiwm/Makefile b/wm/amiwm/Makefile index 561cfc4a421..04ddaa53ee9 100644 --- a/wm/amiwm/Makefile +++ b/wm/amiwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/08/25 21:51:27 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2003/03/14 19:37:59 jlam Exp $ # DISTNAME= amiwm0.20pl48 @@ -19,7 +19,10 @@ USE_BUILDLINK2= yes USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="-DHAVE_X11_EXTENSIONS_SHAPE_H=1 -O" \ - X_PRE_LIBS="-Wl,-R${X11BASE}/lib" \ + X_PRE_LIBS="${X_PRE_LIBS}" \ X_EXTRA_LIBS="-lXt" +X_PRE_LIBS= -Wl,${RPATH_FLAG}${X11BASE}/lib +FIX_RPATH+= X_PRE_LIBS + .include "../../mk/bsd.pkg.mk" |