diff options
| author | dmcmahill <dmcmahill> | 2002-04-06 21:07:37 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2002-04-06 21:07:37 +0000 |
| commit | ce6fc219bbca5f9101ba116d86494b0a350d3293 (patch) | |
| tree | 228187c03f7616b5b9558edf50e33707a879d91b /x11 | |
| parent | 84afcc821ec80e3ec48b170231795939d6e46957 (diff) | |
| download | pkgsrc-ce6fc219bbca5f9101ba116d86494b0a350d3293.tar.gz | |
make sure that USE_XPM is set _before_ pulling in the gcc makefile which
in turn pulls in bsd.prefs.mk.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xfce/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile index 82d854f3b40..2ad308cff15 100644 --- a/x11/xfce/Makefile +++ b/x11/xfce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2002/03/13 17:38:05 fredb Exp $ +# $NetBSD: Makefile,v 1.25 2002/04/06 21:07:37 dmcmahill Exp $ DISTNAME= xfce-3.8.14 PKGREVISION= 1 @@ -13,11 +13,6 @@ BUILD_USES_MSGFMT= yes DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= imlib>=1.9.11nb1:../../graphics/imlib -GCC_VERSION!= gcc --version -.if (${GCC_VERSION:C/-.*$$//} == egcs) && (${MACHINE_ARCH} == alpha) -.include "../../lang/gcc/Makefile.gcc" -.endif - USE_X11= # defined USE_XPM= # defined USE_X11BASE= # defined @@ -29,6 +24,11 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig USE_GMAKE= # defined GNU_CONFIGURE= # defined +GCC_VERSION!= gcc --version +.if (${GCC_VERSION:C/-.*$$//} == egcs) && (${MACHINE_ARCH} == alpha) +.include "../../lang/gcc/Makefile.gcc" +.endif + EVAL_PREFIX+= IMLIBDIR=imlib CONFIGURE_ARGS+= --without-included-gettext CONFIGURE_ARGS+= --datadir=${PREFIX}/share |