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 /time/kworldwatch | |
| 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 'time/kworldwatch')
| -rw-r--r-- | time/kworldwatch/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/time/kworldwatch/Makefile b/time/kworldwatch/Makefile index 62fea244171..00494aa40df 100644 --- a/time/kworldwatch/Makefile +++ b/time/kworldwatch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/10/21 15:29:25 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2003/03/14 19:37:58 jlam Exp $ # DISTNAME= kworldwatch-0.6 @@ -24,7 +24,10 @@ CONFIGURE_ARGS+=--datadir=${BUILDLINK_PREFIX.kdebase}/share/kde \ --enable-path-check CONFIGURE_ENV= KDEDIR=${BUILDLINK_PREFIX.kdebase} \ CXXFLAGS="${CFLAGS}" \ - all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib" + all_libraries="${KDE_LDFLAGS}" + +FIX_RPATH+= KDE_LDFLAGS +KDE_LDFLAGS= -L${LOCALBASE}/lib -Wl,${RPATH_FLAG}${LOCALBASE}/lib -L${X11BASE}/lib -Wl,${RPATH_FLAG}${X11BASE}/lib .include "../../devel/gettext-lib/buildlink2.mk" .include "../../x11/kdebase/buildlink2.mk" |