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