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 /graphics/imlib | |
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 'graphics/imlib')
-rw-r--r-- | graphics/imlib/Makefile | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 7e0da066eeb..6c7c0a2ad89 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2001/06/19 04:32:29 jlam Exp $ +# $NetBSD: Makefile,v 1.52 2001/06/29 04:54:55 jlam Exp $ # DISTNAME= imlib-1.9.8.1 @@ -20,17 +20,6 @@ PLIST_SUBST+= LOCALBASE=${LOCALBASE} USE_GMAKE= yes USE_BUILDLINK_ONLY= yes -USE_CONFIG_WRAPPER= yes - -.include "../../mk/bsd.prefs.mk" - -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/libungif/buildlink.mk" -.include "../../graphics/netpbm/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/tiff/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" CPPFLAGS+= -DENABLE_NLS CONFIGURE_ENV+= ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert" @@ -52,4 +41,11 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/imlib.m4 \ ${LOCALBASE}/share/aclocal/imlib.m4 +.include "../../devel/gettext-lib/buildlink.mk" +.include "../../graphics/jpeg/buildlink.mk" +.include "../../graphics/libungif/buildlink.mk" +.include "../../graphics/netpbm/buildlink.mk" +.include "../../graphics/png/buildlink.mk" +.include "../../graphics/tiff/buildlink.mk" +.include "../../x11/gtk/buildlink.mk" .include "../../mk/bsd.pkg.mk" |