4 files changed, 15 insertions, 8 deletions
diff --git a/x11/gnome-libs/buildlink.mk b/x11/gnome-libs/buildlink.mk
index fd271875678..eceb13adfef 100644
--- a/x11/gnome-libs/buildlink.mk
+++ b/x11/gnome-libs/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.9 2001/07/27 13:33:37 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.10 2001/08/17 21:14:16 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gnome-libs.
 #
@@ -61,11 +61,13 @@ BUILDLINK_CONFIG.gnome-libs=		${BUILDLINK_PREFIX.gnome-libs}/bin/gnome-config
 BUILDLINK_CONFIG_WRAPPER.gnome-libs=	${BUILDLINK_DIR}/bin/gnome-config
 BUILDLINK_CONFIG_WRAPPER.libart=	${BUILDLINK_DIR}/bin/libart-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 GNOME_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.gnome-libs}
 LIBART_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.libart}
 CONFIGURE_ENV+=		GNOME_CONFIG="${GNOME_CONFIG}"
 CONFIGURE_ENV+=		LIBART_CONFIG="${LIBART_CONFIG}"
+MAKE_ENV+=		GNOME_CONFIG="${GNOME_CONFIG}"
+MAKE_ENV+=		LIBART_CONFIG="${LIBART_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.gnome-libs}
diff --git a/x11/gtk/buildlink.mk b/x11/gtk/buildlink.mk
index 3defafc412d..3ecdcd97243 100644
--- a/x11/gtk/buildlink.mk
+++ b/x11/gtk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.9 2001/07/27 13:33:37 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.10 2001/08/17 21:14:16 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gtk.
 #
@@ -43,9 +43,10 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.gtk}
 BUILDLINK_CONFIG.gtk=		${BUILDLINK_PREFIX.gtk}/bin/gtk-config
 BUILDLINK_CONFIG_WRAPPER.gtk=	${BUILDLINK_DIR}/bin/gtk-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 GTK_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.gtk}
 CONFIGURE_ENV+=		GTK_CONFIG="${GTK_CONFIG}"
+MAKE_ENV+=		GTK_CONFIG="${GTK_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.gtk}
diff --git a/x11/kdelibs2/buildlink.mk b/x11/kdelibs2/buildlink.mk
index 3801fb38c30..3f57df847cb 100644
--- a/x11/kdelibs2/buildlink.mk
+++ b/x11/kdelibs2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/07/27 13:33:38 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/08/17 21:14:17 jlam Exp $
 #
 # This Makefile fragment is included by packages that use kdelibs2.
 #
@@ -49,11 +49,13 @@ BUILDLINK_CONFIG_WRAPPER.kdelibs2=	${BUILDLINK_DIR}/bin/kde-config
 BUILDLINK_CONFIG.kdelibs2-artsc=	 ${BUILDLINK_PREFIX.kdelibs2}/bin/artsc-config
 BUILDLINK_CONFIG_WRAPPER.kdelibs2-artsc= ${BUILDLINK_DIR}/bin/artsc-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 ARTSCCONFIG?=		${BUILDLINK_CONFIG_WRAPPER.kdelibs2-artsc}
 KDECONFIG?=		${BUILDLINK_CONFIG_WRAPPER.kdelibs2}
 CONFIGURE_ENV+=		ARTSCCONFIG="${ARTSCCONFIG}"
 CONFIGURE_ENV+=		KDECONFIG="${KDECONFIG}"
+MAKE_ENV+=		ARTSCCONFIG="${ARTSCCONFIG}"
+MAKE_ENV+=		KDECONFIG="${KDECONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.kdelibs2}
diff --git a/x11/wxGTK/buildlink.mk b/x11/wxGTK/buildlink.mk
index 725ac83489b..c6a063451d2 100644
--- a/x11/wxGTK/buildlink.mk
+++ b/x11/wxGTK/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/07/27 13:33:39 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/08/17 21:14:18 jlam Exp $
 #
 # This Makefile fragment is included by packages that use wxGTK.
 #
@@ -49,11 +49,13 @@ BUILDLINK_CONFIG.wxGTK-2=		${BUILDLINK_PREFIX.wxGTK}/bin/wxgtk-config
 BUILDLINK_CONFIG_WRAPPER.wxGTK-1=	${BUILDLINK_DIR}/bin/wx-config
 BUILDLINK_CONFIG_WRAPPER.wxGTK-2=	${BUILDLINK_DIR}/bin/wxgtk-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 WX_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.wxGTK-1}
 WXGTK_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.wxGTK-2}
 CONFIGURE_ENV+=		WX_CONFIG="${WX_CONFIG}"
 CONFIGURE_ENV+=		WXGTK_CONFIG="${WXGTK_CONFIG}"
+MAKE_ENV+=		WX_CONFIG="${WX_CONFIG}"
+MAKE_ENV+=		WXGTK_CONFIG="${WXGTK_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.wxGTK}