diff options
| author | jlam <jlam> | 2003-03-14 19:37:30 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-03-14 19:37:30 +0000 |
| commit | f69d0aee59b843edb712e3c7201d67c1860a9902 (patch) | |
| tree | 4ee2e06249d68477cf3fb68be1f095453bcec90d /chat | |
| parent | 2045c3a17f778f4291f00ac8495b025fac1eb26c (diff) | |
| download | pkgsrc-f69d0aee59b843edb712e3c7201d67c1860a9902.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 'chat')
| -rw-r--r-- | chat/fugu/Makefile | 4 | ||||
| -rw-r--r-- | chat/kicq/Makefile | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/chat/fugu/Makefile b/chat/fugu/Makefile index b2ba3d802e3..58dfbdcdc99 100644 --- a/chat/fugu/Makefile +++ b/chat/fugu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/12/08 02:17:45 salo Exp $ +# $NetBSD: Makefile,v 1.7 2003/03/14 19:37:32 jlam Exp $ # DISTNAME= fugu-1.0 @@ -15,7 +15,7 @@ USE_BUILDLINK2= YES GNU_CONFIGURE= YES CONFIGURE_ENV+= vi_cv_path_python=${PYTHONBIN} LDFLAGS+= -L${BUILDLINK_PREFIX.py-Pmw}/lib \ - -Wl,-R${BUILDLINK_PREFIX.py-Pmw}/lib + -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.py-Pmw}/lib CPPFLAGS+= -I${BUILDLINK_PREFIX.py-Pmw}/include \ -I${BUILDLINK_PREFIX.rsaref}/include/rsaref \ -I${BUILDLINK_PREFIX.rsaref}/include diff --git a/chat/kicq/Makefile b/chat/kicq/Makefile index 701950d8354..41a58e0ebad 100644 --- a/chat/kicq/Makefile +++ b/chat/kicq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/03/12 21:02:25 jschauma Exp $ +# $NetBSD: Makefile,v 1.12 2003/03/14 19:37:32 jlam Exp $ DISTNAME= kicq-1.0.0 PKGREVISION= 1 @@ -25,6 +25,9 @@ CONFIGURE_ARGS+= --datadir=${KDEBASEDIR}/share/kde \ --with-icq-libs=${LOCALBASE}/lib CONFIGURE_ENV+= KDEDIR=${KDEBASEDIR} \ CXXFLAGS="${CFLAGS}" \ - all_libraries="-Wl,-R${QT1DIR}/qt1/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -ltiff -ljpeg -lpng -lz" + all_libraries="${KDE_LDFLAGS}" + +FIX_RPATH+= KDE_LDFLAGS +KDE_LDFLAGS= -Wl,${RPATH_FLAG}${QT1DIR}/qt1/lib -L${LOCALBASE}/lib -Wl,${RPATH_FLAG}${LOCALBASE}/lib -L${X11BASE}/lib -Wl,${RPATH_FLAG}${X11BASE}/lib -ltiff -ljpeg -lpng -lz" .include "../../mk/bsd.pkg.mk" |