diff options
| author | jlam <jlam@pkgsrc.org> | 2001-06-29 04:54:49 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-06-29 04:54:49 +0000 |
| commit | 3b65bde2f7e4aec38e1ead305f6094960fd84a31 (patch) | |
| tree | 0f7f2aeb7ecca34d147342f726930d3cafaae39e /editors | |
| parent | 37360e73f33abdbb3d35f35c1f3ca74e0fb6b684 (diff) | |
| download | pkgsrc-3b65bde2f7e4aec38e1ead305f6094960fd84a31.tar.gz | |
USE_CONFIG_WRAPPER is automatically set if USE_BUILDLINK_ONLY is defined,
so remove it from package Makefiles. Also move the inclusion of the
buildlink.mk files to the end of the Makefile to just before bsd.pkg.mk
to ensure that any Makefile settings occur before the buildlink.mk files.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/abiword/Makefile | 11 | ||||
| -rw-r--r-- | editors/vim-gtk/Makefile | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 6d9dea019ef..dc504a3d2f1 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2001/06/11 06:34:30 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2001/06/29 04:54:52 jlam Exp $ # # According to AbiSource's explanation of their trademark rights, # compilations/distributions of AbiWord not provided by AbiSource must @@ -24,16 +24,14 @@ COMMENT= Open Source cross-platform word processor BUILD_DEPENDS+= unzip-*:../../archivers/unzip DEPENDS+= ispell-base-*:../../textproc/ispell-base -DEPENDS+= gtk+-1.2.*:../../x11/gtk + +USE_BUILDLINK_ONLY= # defined USE_X11= # defined USE_XPM= # defined USE_GMAKE= # defined ALL_TARGET= compile canonical -.include "../../converters/libiconv/buildlink.mk" -.include "../../graphics/png/buildlink.mk" - OS_CFLAGS= ${CFLAGS} .if exists(/usr/include/inttypes.h) @@ -62,4 +60,7 @@ post-install: ${LN} -sf ../../../lib/american.hash \ ${PREFIX}/share/AbiSuite/dictionary/american.hash +.include "../../converters/libiconv/buildlink.mk" +.include "../../graphics/png/buildlink.mk" +.include "../../x11/gtk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile index db2cc3e593b..13e284f440d 100644 --- a/editors/vim-gtk/Makefile +++ b/editors/vim-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/06/20 20:03:04 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2001/06/29 04:54:52 jlam Exp $ .include "../vim-share/Makefile.common" @@ -13,7 +13,6 @@ DISTFILES+= ${DISTNAME}-rt${EXTRACT_SUFX} USE_X11= yes USE_BUILDLINK_ONLY= yes -USE_CONFIG_WRAPPER= yes CONFIGURE_ARGS+= --enable-gui=gtk CONFIGURE_ARGS+= --with-tlib=ncurses |