diff options
| author | jlam <jlam> | 2001-08-17 21:14:00 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-08-17 21:14:00 +0000 |
| commit | b45411cc1b4b42fb5518a177990e4434a12df95e (patch) | |
| tree | fa3d9f5ef1b3d09d7f07e8af050bff38fe74e6f4 /x11/wxGTK | |
| parent | b52faff4803ac19723c0b6e91554988066e10fa8 (diff) | |
| download | pkgsrc-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 'x11/wxGTK')
| -rw-r--r-- | x11/wxGTK/buildlink.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/x11/wxGTK/buildlink.mk b/x11/wxGTK/buildlink.mk index 725ac83489b..c6a063451d2 100644 --- a/x11/wxGTK/buildlink.mk +++ b/x11/wxGTK/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.7 2001/07/27 13:33:39 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.8 2001/08/17 21:14:18 jlam Exp $ # # This Makefile fragment is included by packages that use wxGTK. # @@ -49,11 +49,13 @@ BUILDLINK_CONFIG.wxGTK-2= ${BUILDLINK_PREFIX.wxGTK}/bin/wxgtk-config BUILDLINK_CONFIG_WRAPPER.wxGTK-1= ${BUILDLINK_DIR}/bin/wx-config BUILDLINK_CONFIG_WRAPPER.wxGTK-2= ${BUILDLINK_DIR}/bin/wxgtk-config -.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) +.if defined(USE_CONFIG_WRAPPER) WX_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.wxGTK-1} WXGTK_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.wxGTK-2} CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}" CONFIGURE_ENV+= WXGTK_CONFIG="${WXGTK_CONFIG}" +MAKE_ENV+= WX_CONFIG="${WX_CONFIG}" +MAKE_ENV+= WXGTK_CONFIG="${WXGTK_CONFIG}" .endif pre-configure: ${BUILDLINK_TARGETS.wxGTK} |