diff options
| author | jlam <jlam> | 2001-06-12 20:33:00 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-06-12 20:33:00 +0000 |
| commit | 5219bc3cc8b557d12cd318cf81b5452c4749021e (patch) | |
| tree | 154e7feac1d9bd8853bbdc9b7ffa45c13b83f32f /x11 | |
| parent | 922b2021ce419c500817dc9b7bec08dac0dbbfa2 (diff) | |
| download | pkgsrc-5219bc3cc8b557d12cd318cf81b5452c4749021e.tar.gz | |
LIBS is automatically added to CONFIGURE_ENV by bsd.pkg.mk if
GNU_CONFIGURE is defined, so simply set LIBS to the appropriate value.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gdm/Makefile | 5 | ||||
| -rw-r--r-- | x11/kdebase2/Makefile | 4 | ||||
| -rw-r--r-- | x11/kdelibs2/Makefile | 7 |
3 files changed, 8 insertions, 8 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 57c19a36163..7e8d7a6919f 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/06/11 06:34:57 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2001/06/12 20:33:09 jlam Exp $ DISTNAME= gdm-2.2.0 CATEGORIES= x11 gnome @@ -25,8 +25,7 @@ LOCALSTATEDIR= /var/gnome EVAL_PREFIX+= KDEBASEDIR=kdebase CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} -CONFIGURE_ENV+= LIBS="${LIBS}" \ - LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ +CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ GDMOWN=${GDMOWN} GDMGRP=${GDMGRP} DEINSTALL_FILE= ${WRKDIR}/DEINSTALL diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index 7a778480c9d..453fba640df 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/05/11 17:43:21 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.15 2001/06/12 20:33:10 jlam Exp $ DISTNAME= kdebase-2.1 CATEGORIES= x11 kde @@ -17,7 +17,7 @@ USE_MESA= yes .include "../../x11/kde2/Makefile.part2" CONFIGURE_ARGS+= --disable-greet-lib -CONFIGURE_ENV+= LIBS="-Wl,--export-dynamic" +LIBS= -Wl,--export-dynamic EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} IMAKEDIR= ${WRKDIR}/imake diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index cff95092096..4dda952d990 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/05/24 22:18:22 skrll Exp $ +# $NetBSD: Makefile,v 1.5 2001/06/12 20:33:10 jlam Exp $ # DISTNAME= kdelibs-2.1 @@ -11,6 +11,7 @@ DEPENDS+= tiff-*:../../graphics/tiff DEPENDS+= qt2-libs>=2.2.4:../../x11/qt2-libs DEPENDS+= libaudiofile-*:../../audio/libaudiofile DEPENDS+= jade>=1.2.1:../../textproc/jade + .include "../../x11/kde2/Makefile.part2" USE_LTDL= yes @@ -22,8 +23,8 @@ LTCONFIG_OVERRIDE+= ${WRKSRC}/ksgmltools/ltconfig DEPENDS+= pcre>=3.4:../../devel/pcre .endif -CONFIGURE_ENV+= LIBS="-Wl,--export-dynamic" \ - KJS_USE_PCRE="${KJS_USE_PCRE}" +CONFIGURE_ENV+= KJS_USE_PCRE="${KJS_USE_PCRE}" +LIBS= -Wl,--export-dynamic MKDIRS= share/kde/icons/locolor/32x32/actions/kde \ share/kde/icons/locolor/22x22/mimetypes \ |