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/gdk-pixbuf | |
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/gdk-pixbuf')
-rw-r--r-- | graphics/gdk-pixbuf/Makefile.common | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common index d4ff6f647fc..9649ec891bc 100644 --- a/graphics/gdk-pixbuf/Makefile.common +++ b/graphics/gdk-pixbuf/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2001/06/18 21:40:25 jlam Exp $ +# $NetBSD: Makefile.common,v 1.12 2001/06/29 04:54:54 jlam Exp $ # DISTNAME= gdk-pixbuf-0.10.1 @@ -17,14 +17,8 @@ USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= # defined -USE_CONFIG_WRAPPER= # defined USE_BUILDLINK_ONLY= # defined -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/tiff/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" - M4= ${LOCALBASE}/bin/gm4 PLIST_SUBST+= LOCALBASE=${LOCALBASE} @@ -35,3 +29,8 @@ pre-configure: cd ${WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/autoconf && \ ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/automake + +.include "../../graphics/jpeg/buildlink.mk" +.include "../../graphics/png/buildlink.mk" +.include "../../graphics/tiff/buildlink.mk" +.include "../../x11/gtk/buildlink.mk" |