diff options
| author | jlam <jlam> | 2001-06-29 04:54:49 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-06-29 04:54:49 +0000 |
| commit | 248e653126f88e8826180e58af0f27de58c1fc01 (patch) | |
| tree | 0f7f2aeb7ecca34d147342f726930d3cafaae39e /x11 | |
| parent | aaf80c5bfdf5ecb0c919823c1b2442451e1dec77 (diff) | |
| download | pkgsrc-248e653126f88e8826180e58af0f27de58c1fc01.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 'x11')
| -rw-r--r-- | x11/gnome-libs/Makefile | 16 | ||||
| -rw-r--r-- | x11/gtk/Makefile | 9 |
2 files changed, 10 insertions, 15 deletions
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 0c809cb408c..62f83f58cd9 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2001/06/26 16:30:58 jlam Exp $ +# $NetBSD: Makefile,v 1.67 2001/06/29 04:54:56 jlam Exp $ DISTNAME= gnome-libs-1.2.13 CATEGORIES= x11 gnome @@ -23,18 +23,10 @@ CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \ X11BASE=${X11BASE} \ PKGLOCALEDIR=${PKGLOCALEDIR} -USE_CONFIG_WRAPPER= YES USE_BUILDLINK_ONLY= YES REPLACE_BUILDLINK= gnomeConf.sh REPLACE_BUILDLINK+= gnome-config -.include "../../audio/esound/buildlink.mk" -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../graphics/imlib/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../net/ORBit/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" - LOCALSTATEDIR= /var/gnome PLIST_SUBST+= LOCALBASE=${LOCALBASE} \ LOCALEDIR=${LOCALEDIR} \ @@ -73,4 +65,10 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/libart.m4 \ ${LOCALBASE}/share/aclocal/libart.m4 +.include "../../audio/esound/buildlink.mk" +.include "../../devel/gettext-lib/buildlink.mk" +.include "../../graphics/imlib/buildlink.mk" +.include "../../graphics/xpm/buildlink.mk" +.include "../../net/ORBit/buildlink.mk" +.include "../../x11/gtk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 641f32ab530..0c26238acf0 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2001/06/26 16:30:58 jlam Exp $ +# $NetBSD: Makefile,v 1.64 2001/06/29 04:54:56 jlam Exp $ DISTNAME= gtk+-1.2.10 CATEGORIES= x11 @@ -15,10 +15,8 @@ BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5 BUILD_USES_MSGFMT= yes USE_BUILDLINK_ONLY= yes -USE_CONFIG_WRAPPER= yes REPLACE_BUILDLINK= gtk-config -#USE_LIBINTL= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig USE_X11BASE= yes @@ -30,9 +28,6 @@ CONFIGURE_ENV+= X_LDFLAGS="${X_LDFLAGS}" INFO_FILES= gdk.info gtk.info -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/glib/buildlink.mk" - MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" PLIST_SUBST+= LOCALBASE=${LOCALBASE} @@ -69,4 +64,6 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/gtk.m4 \ ${LOCALBASE}/share/aclocal/gtk.m4 +.include "../../devel/gettext-lib/buildlink.mk" +.include "../../devel/glib/buildlink.mk" .include "../../mk/bsd.pkg.mk" |