diff options
| author | jlam <jlam> | 2005-08-10 20:56:10 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-08-10 20:56:10 +0000 |
| commit | b3f78ea1dc65ca87b470169b6f46da18d36bf91b (patch) | |
| tree | 4d8a0ec4125811389b8272e1e14bc12417f9448c /editors/conglomerate | |
| parent | 6cc0e59139f460170ef1bc22cecf04a148381243 (diff) | |
| download | pkgsrc-b3f78ea1dc65ca87b470169b6f46da18d36bf91b.tar.gz | |
Remove the abuse of buildlink that was pkg-config/buildlink3.mk. That
file's sole purpose was to provide a dependency on pkg-config and set
some environment variables. Instead, turn pkg-config into a "tool"
in the tools framework, where the pkg-config wrapper automatically
adds PKG_CONFIG_LIBDIR to the environment before invoking the real
pkg-config.
For all package Makefiles that included pkg-config/buildlink3.mk, remove
that inclusion and replace it with USE_TOOLS+=pkg-config.
Diffstat (limited to 'editors/conglomerate')
| -rw-r--r-- | editors/conglomerate/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile index cb421487e8c..2442a8369a0 100644 --- a/editors/conglomerate/Makefile +++ b/editors/conglomerate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/07/21 16:29:49 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2005/08/10 20:56:16 jlam Exp $ # DISTNAME= conglomerate-0.9.0 @@ -16,7 +16,7 @@ DEPENDS+= docbook-xml>=4.2nb6:../../textproc/docbook-xml GNU_CONFIGURE= yes USE_DIRS+= gnome2-1.5 USE_LIBTOOL= yes -USE_TOOLS+= gmake perl +USE_TOOLS+= gmake perl pkg-config USE_PKGLOCALEDIR= yes CONFIGURE_ARGS+= --enable-printing @@ -31,7 +31,6 @@ GCONF2_SCHEMAS= conglomerate.schemas .include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../print/libgnomeprint/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" .include "../../textproc/enchant/buildlink3.mk" |