From 7bba3453dcd5c02664d566030e3f34ec592d89f7 Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 17 Aug 2001 21:14:00 +0000 Subject: If USE_CONFIG_WRAPPER is defined (implied by USE_BUILDLINK_ONLY), then set FOO_CONFIG=${BUILDLINK_CONFIG_WRAPPER.foo} in both CONFIGURE_ENV and MAKE_ENV. We remove the check for GNU_CONFIGURE because if a package Makefile includes the buildlink.mk file, then it most likely wants to use the config script wrappers as well. Change suggested by Hubert Feyrer (hubertf) and Tomasz Luchowski (zuntum). --- textproc/libxml2/buildlink.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'textproc/libxml2') diff --git a/textproc/libxml2/buildlink.mk b/textproc/libxml2/buildlink.mk index 57e0dd50eaf..8dcb22b6ec8 100644 --- a/textproc/libxml2/buildlink.mk +++ b/textproc/libxml2/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2001/07/27 13:33:35 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.6 2001/08/17 21:14:15 jlam Exp $ # # This Makefile fragment is included by packages that use libxml2. # @@ -38,9 +38,10 @@ BUILDLINK_CONFIG.libxml2= \ BUILDLINK_CONFIG_WRAPPER.libxml2= \ ${BUILDLINK_DIR}/bin/xml2-config -.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) +.if defined(USE_CONFIG_WRAPPER) XML2_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.libxml2} CONFIGURE_ENV+= XML2_CONFIG="${XML2_CONFIG}" +MAKE_ENV+= XML2_CONFIG="${XML2_CONFIG}" .endif pre-configure: ${BUILDLINK_TARGETS.libxml2} -- cgit v1.2.3