summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-07-02 05:33:56 +0000
committerjlam <jlam@pkgsrc.org>2001-07-02 05:33:56 +0000
commit9943bc93dbaa749514a714454c86eb24a7e7391a (patch)
tree19c7e2e29dc44e4223793c407ad72432c180403f /devel
parentaa91870439cf7d4174f5e4574ed401b302c4acc3 (diff)
downloadpkgsrc-9943bc93dbaa749514a714454c86eb24a7e7391a.tar.gz
Allow overriding of *_CONFIG variables in a package Makefile when using
USE_BUILDLINK_ONLY.
Diffstat (limited to 'devel')
-rw-r--r--devel/SDL/buildlink.mk10
-rw-r--r--devel/glib/buildlink.mk5
-rw-r--r--devel/pcre/buildlink.mk5
-rw-r--r--devel/smpeg/buildlink.mk5
4 files changed, 15 insertions, 10 deletions
diff --git a/devel/SDL/buildlink.mk b/devel/SDL/buildlink.mk
index 3ce0a91b2eb..168a2b4e986 100644
--- a/devel/SDL/buildlink.mk
+++ b/devel/SDL/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:14 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/02 05:33:57 jlam Exp $
#
# This Makefile fragment is included by packages that use SDL.
#
@@ -27,6 +27,9 @@ BUILDLINK_FILES.SDL+= lib/libSDLmain.*
.include "../../mk/bsd.prefs.mk"
+REPLACE_BUILDLINK_SED+= \
+ -e "s|${BUILDLINK_CONFIG_WRAPPER.SDL}|${BUILDLINK_CONFIG.SDL}|g"
+
.if defined(SDL_USE_NAS)
.include "../../audio/nas/buildlink.mk
.endif
@@ -42,11 +45,10 @@ BUILDLINK_CONFIG.SDL= ${LOCALBASE}/bin/sdl-config
BUILDLINK_CONFIG_WRAPPER.SDL= ${BUILDLINK_DIR}/bin/sdl-config
.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+= SDL_CONFIG="${BUILDLINK_CONFIG_WRAPPER.SDL}"
+SDL_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.SDL}
+CONFIGURE_ENV+= SDL_CONFIG="${SDL_CONFIG}"
.endif
-REPLACE_BUILDLINK_SED+= -e "s|${BUILDLINK_CONFIG_WRAPPER.SDL}|${BUILDLINK_CONFIG.SDL}|g"
-
pre-configure: ${BUILDLINK_TARGETS.SDL}
SDL-buildlink: _BUILDLINK_USE
SDL-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
diff --git a/devel/glib/buildlink.mk b/devel/glib/buildlink.mk
index 1599e12b31d..3b9da15aca8 100644
--- a/devel/glib/buildlink.mk
+++ b/devel/glib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:15 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/02 05:33:57 jlam Exp $
#
# This Makefile fragment is included by packages that use glib.
#
@@ -37,7 +37,8 @@ BUILDLINK_CONFIG.glib= ${LOCALBASE}/bin/glib-config
BUILDLINK_CONFIG_WRAPPER.glib= ${BUILDLINK_DIR}/bin/glib-config
.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+= GLIB_CONFIG="${BUILDLINK_CONFIG_WRAPPER.glib}"
+GLIB_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.glib}
+CONFIGURE_ENV+= GLIB_CONFIG="${GLIB_CONFIG}"
.endif
pre-configure: ${BUILDLINK_TARGETS.glib}
diff --git a/devel/pcre/buildlink.mk b/devel/pcre/buildlink.mk
index 9f660fcfd99..37f50253564 100644
--- a/devel/pcre/buildlink.mk
+++ b/devel/pcre/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:18 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/02 05:33:58 jlam Exp $
#
# This Makefile fragment is included by packages that use pcre.
#
@@ -34,7 +34,8 @@ BUILDLINK_CONFIG.pcre= ${LOCALBASE}/bin/pcre-config
BUILDLINK_CONFIG_WRAPPER.pcre= ${BUILDLINK_DIR}/bin/pcre-config
.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+= PCRE_CONFIG="${BUILDLINK_CONFIG_WRAPPER.pcre}"
+PCRE_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.pcre}
+CONFIGURE_ENV+= PCRE_CONFIG="${PCRE_CONFIG}"
.endif
pre-configure: ${BUILDLINK_TARGETS.pcre}
diff --git a/devel/smpeg/buildlink.mk b/devel/smpeg/buildlink.mk
index 307e10d60b4..b15db7b05eb 100644
--- a/devel/smpeg/buildlink.mk
+++ b/devel/smpeg/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:20 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/02 05:33:58 jlam Exp $
#
# This Makefile fragment is included by packages that use smpeg.
#
@@ -35,7 +35,8 @@ BUILDLINK_CONFIG.smpeg= ${LOCALBASE}/bin/smpeg-config
BUILDLINK_CONFIG_WRAPPER.smpeg= ${BUILDLINK_DIR}/bin/smpeg-config
.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+= SMPEG_CONFIG="${BUILDLINK_CONFIG_WRAPPER.smpeg}"
+SMPEG_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.smpeg}
+CONFIGURE_ENV+= SMPEG_CONFIG="${SMPEG_CONFIG}"
.endif
pre-configure: ${BUILDLINK_TARGETS.smpeg}