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). --- audio/xmms/buildlink.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'audio/xmms') diff --git a/audio/xmms/buildlink.mk b/audio/xmms/buildlink.mk index 47dafa89a41..24d853eb89f 100644 --- a/audio/xmms/buildlink.mk +++ b/audio/xmms/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/08/16 04:25:23 zuntum Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/08/17 21:14:02 jlam Exp $ # # This Makefile fragment is included by packages that use xmms. # @@ -39,9 +39,10 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.xmms} BUILDLINK_CONFIG.xmms= ${BUILDLINK_PREFIX.xmms}/bin/xmms-config BUILDLINK_CONFIG_WRAPPER.xmms= ${BUILDLINK_DIR}/bin/xmms-config -.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) +.if defined(USE_CONFIG_WRAPPER) XMMS_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.xmms} CONFIGURE_ENV+= XMMS_CONFIG="${XMMS_CONFIG}" +MAKE_ENV+= XMMS_CONFIG="${XMMS_CONFIG}" .endif pre-configure: ${BUILDLINK_TARGETS.xmms} -- cgit v1.2.3