Substitute the real config script for the config wrapper script in

installed files.  We don't want buildlink references to escape into the
install directory.

10 files changed, 34 insertions, 12 deletions

diff --git a/devel/GConf/buildlink.mk b/devel/GConf/buildlink.mk
index 842951d74df..0a854ccefd1 100644
--- a/devel/GConf/buildlink.mk
+++ b/devel/GConf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/10/01 11:57:11 rh Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/10/03 20:56:43 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gconf.
 #
@@ -36,6 +36,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.gconf}
 
 BUILDLINK_CONFIG.gconf=	${BUILDLINK_PREFIX.gconf}/bin/gconf-config
 BUILDLINK_CONFIG_WRAPPER.gconf=${BUILDLINK_DIR}/bin/gconf-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.gconf}|${BUILDLINK_CONFIG.gconf}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 GCONF_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.gconf}
diff --git a/devel/SDL/buildlink.mk b/devel/SDL/buildlink.mk
index ab7a215b889..b5cabbe2991 100644
--- a/devel/SDL/buildlink.mk
+++ b/devel/SDL/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.10 2001/08/17 21:14:03 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.11 2001/10/03 20:56:43 jlam Exp $
 #
 # This Makefile fragment is included by packages that use SDL.
 #
@@ -44,6 +44,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.SDL}
 
 BUILDLINK_CONFIG.SDL=		${BUILDLINK_PREFIX.SDL}/bin/sdl-config
 BUILDLINK_CONFIG_WRAPPER.SDL=	${BUILDLINK_DIR}/bin/sdl-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.SDL}|${BUILDLINK_CONFIG.SDL}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 SDL_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.SDL}
diff --git a/devel/glib/buildlink.mk b/devel/glib/buildlink.mk
index 78c074340a0..3a63bf7cf52 100644
--- a/devel/glib/buildlink.mk
+++ b/devel/glib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.11 2001/08/17 21:14:04 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.12 2001/10/03 20:56:44 jlam Exp $
 #
 # This Makefile fragment is included by packages that use glib.
 #
@@ -40,6 +40,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.glib}
 
 BUILDLINK_CONFIG.glib=		${BUILDLINK_PREFIX.glib}/bin/glib-config
 BUILDLINK_CONFIG_WRAPPER.glib=	${BUILDLINK_DIR}/bin/glib-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.glib}|${BUILDLINK_CONFIG.glib}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 GLIB_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.glib}
diff --git a/devel/libnet/buildlink.mk b/devel/libnet/buildlink.mk
index 05f34791f76..cc9f3ad2f9f 100644
--- a/devel/libnet/buildlink.mk
+++ b/devel/libnet/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/08/17 21:14:05 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/10/03 20:56:44 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libnet.
 #
@@ -35,6 +35,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.libnet}
 
 BUILDLINK_CONFIG.libnet=	${BUILDLINK_PREFIX.libnet}/bin/libnet-config
 BUILDLINK_CONFIG_WRAPPER.libnet=${BUILDLINK_DIR}/bin/libnet-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.libnet}|${BUILDLINK_CONFIG.libnet}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 LIBNET_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.libnet}
diff --git a/devel/libole2/buildlink.mk b/devel/libole2/buildlink.mk
index eb776303627..0dc470bdfa4 100644
--- a/devel/libole2/buildlink.mk
+++ b/devel/libole2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/10/01 13:34:49 rh Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/10/03 20:56:44 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libole2.
 #
@@ -31,8 +31,10 @@ BUILDLINK_TARGETS.libole2=	libole2-buildlink
 BUILDLINK_TARGETS.libole2+=	libole2-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.libole2}
 
-BUILDLINK_CONFIG.libole2=		${BUILDLINK_PREFIX.libole2}/lib/libole2Conf.sh
+BUILDLINK_CONFIG.libole2=	${BUILDLINK_PREFIX.libole2}/lib/libole2Conf.sh
 BUILDLINK_CONFIG_WRAPPER.libole2=	${BUILDLINK_DIR}/lib/libole2Conf.sh
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.libole2}|${BUILDLINK_CONFIG.libole2}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 LIBOLE2_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.libole2}
diff --git a/devel/libusb/buildlink.mk b/devel/libusb/buildlink.mk
index 93bec549453..bceb5474e28 100644
--- a/devel/libusb/buildlink.mk
+++ b/devel/libusb/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/08/17 21:14:06 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/10/03 20:56:45 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libusb.
 #
@@ -32,7 +32,9 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.libusb}
 BUILDLINK_CONFIG.libusb=	\
 			${BUILDLINK_PREFIX.libusb}/bin/libusb-config
 BUILDLINK_CONFIG_WRAPPER.libusb=	\
-			${BUILDLINK_DIR}/bin/libusb-config
+	 		${BUILDLINK_DIR}/bin/libusb-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.libusb}|${BUILDLINK_CONFIG.libusb}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 LIBUSB_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.libusb}
diff --git a/devel/oaf/buildlink.mk b/devel/oaf/buildlink.mk
index f35fea0dd01..d5483e464b0 100644
--- a/devel/oaf/buildlink.mk
+++ b/devel/oaf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/10/01 12:03:42 rh Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/10/03 20:56:45 jlam Exp $
 #
 # This Makefile fragment is included by packages that use oaf.
 #
@@ -35,6 +35,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.oaf}
 
 BUILDLINK_CONFIG.oaf=	${BUILDLINK_PREFIX.oaf}/bin/oaf-config
 BUILDLINK_CONFIG_WRAPPER.oaf=${BUILDLINK_DIR}/bin/oaf-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.oaf}|${BUILDLINK_CONFIG.oaf}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 OAF_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.oaf}
diff --git a/devel/pcre/buildlink.mk b/devel/pcre/buildlink.mk
index 5869a8a1954..317e2d0b612 100644
--- a/devel/pcre/buildlink.mk
+++ b/devel/pcre/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/08/17 21:14:06 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/10/03 20:56:45 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pcre.
 #
@@ -33,6 +33,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.pcre}
 
 BUILDLINK_CONFIG.pcre=		${BUILDLINK_PREFIX.pcre}/bin/pcre-config
 BUILDLINK_CONFIG_WRAPPER.pcre=	${BUILDLINK_DIR}/bin/pcre-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.pcre}|${BUILDLINK_CONFIG.pcre}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 PCRE_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.pcre}
diff --git a/devel/pth/buildlink.mk b/devel/pth/buildlink.mk
index 23518822976..016b6fc95b4 100644
--- a/devel/pth/buildlink.mk
+++ b/devel/pth/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/08/17 21:14:07 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/10/03 20:56:46 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pth.
 #
@@ -34,9 +34,13 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.pth}
 
 BUILDLINK_CONFIG.pth=			${BUILDLINK_PREFIX.pth}/bin/pth-config
 BUILDLINK_CONFIG_WRAPPER.pth=		${BUILDLINK_DIR}/bin/pth-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.pth}|${BUILDLINK_CONFIG.pth}|g"
 
 BUILDLINK_CONFIG.pth-pthread=		${BUILDLINK_PREFIX.pth}/bin/pthread-config
 BUILDLINK_CONFIG_WRAPPER.pth-pthread=	${BUILDLINK_DIR}/bin/pthread-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.pthread}|${BUILDLINK_CONFIG.pthread}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 PTH_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.pth}
diff --git a/devel/smpeg/buildlink.mk b/devel/smpeg/buildlink.mk
index cdf300fc3ca..383aeac87af 100644
--- a/devel/smpeg/buildlink.mk
+++ b/devel/smpeg/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/08/17 21:14:08 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/10/03 20:56:46 jlam Exp $
 #
 # This Makefile fragment is included by packages that use smpeg.
 #
@@ -34,6 +34,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.smpeg}
 
 BUILDLINK_CONFIG.smpeg=		${BUILDLINK_PREFIX.smpeg}/bin/smpeg-config
 BUILDLINK_CONFIG_WRAPPER.smpeg=	${BUILDLINK_DIR}/bin/smpeg-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.smpeg}|${BUILDLINK_CONFIG.smpeg}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 SMPEG_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.smpeg}