summaryrefslogtreecommitdiff
path: root/devel/libusb
diff options
context:
space:
mode:
authorjlam <jlam>2001-08-17 21:14:00 +0000
committerjlam <jlam>2001-08-17 21:14:00 +0000
commitb45411cc1b4b42fb5518a177990e4434a12df95e (patch)
treefa3d9f5ef1b3d09d7f07e8af050bff38fe74e6f4 /devel/libusb
parentb52faff4803ac19723c0b6e91554988066e10fa8 (diff)
downloadpkgsrc-b45411cc1b4b42fb5518a177990e4434a12df95e.tar.gz
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).
Diffstat (limited to 'devel/libusb')
-rw-r--r--devel/libusb/buildlink.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/devel/libusb/buildlink.mk b/devel/libusb/buildlink.mk
index a78dfcf77a4..93bec549453 100644
--- a/devel/libusb/buildlink.mk
+++ b/devel/libusb/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/07/24 11:17:46 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/08/17 21:14:06 jlam Exp $
#
# This Makefile fragment is included by packages that use libusb.
#
@@ -34,9 +34,10 @@ BUILDLINK_CONFIG.libusb= \
BUILDLINK_CONFIG_WRAPPER.libusb= \
${BUILDLINK_DIR}/bin/libusb-config
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
LIBUSB_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.libusb}
CONFIGURE_ENV+= LIBUSB_CONFIG="${LIBUSB_CONFIG}"
+MAKE_ENV+= LIBUSB_CONFIG="${LIBUSB_CONFIG}"
.endif
pre-configure: ${BUILDLINK_TARGETS.libusb}