From f8078a78a9737d0da422cd83573039caaef5bf2a 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). --- devel/smpeg/buildlink.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'devel/smpeg') diff --git a/devel/smpeg/buildlink.mk b/devel/smpeg/buildlink.mk index 497266a5ada..cdf300fc3ca 100644 --- a/devel/smpeg/buildlink.mk +++ b/devel/smpeg/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.7 2001/07/27 13:33:26 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.8 2001/08/17 21:14:08 jlam Exp $ # # This Makefile fragment is included by packages that use smpeg. # @@ -35,9 +35,10 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.smpeg} BUILDLINK_CONFIG.smpeg= ${BUILDLINK_PREFIX.smpeg}/bin/smpeg-config BUILDLINK_CONFIG_WRAPPER.smpeg= ${BUILDLINK_DIR}/bin/smpeg-config -.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) +.if defined(USE_CONFIG_WRAPPER) SMPEG_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.smpeg} CONFIGURE_ENV+= SMPEG_CONFIG="${SMPEG_CONFIG}" +MAKE_ENV+= SMPEG_CONFIG="${SMPEG_CONFIG}" .endif pre-configure: ${BUILDLINK_TARGETS.smpeg} -- cgit v1.2.3