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.

6 files changed, 18 insertions, 6 deletions

diff --git a/audio/SDL-mixer/buildlink.mk b/audio/SDL-mixer/buildlink.mk
index a06cbc0717b..ad8528867b9 100644
--- a/audio/SDL-mixer/buildlink.mk
+++ b/audio/SDL-mixer/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2001/09/24 15:00:25 rh Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/10/03 20:56:40 jlam Exp $
 #
 # This Makefile fragment is included by packages that use SDL_mixer.
 #
@@ -33,6 +33,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.SDL_mixer}
 
 BUILDLINK_CONFIG.SDL_mixer=		${LOCALBASE}/bin/SDL_mixer-config
 BUILDLINK_CONFIG_WRAPPER.SDL_mixer=	${BUILDLINK_DIR}/bin/SDL_mixer-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.SDL_mixer}|${BUILDLINK_CONFIG.SDL_mixer}|g"
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
 SDL_MIXER_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.SDL_mixer}
diff --git a/audio/esound/buildlink.mk b/audio/esound/buildlink.mk
index f2033372e0a..05be624acc8 100644
--- a/audio/esound/buildlink.mk
+++ b/audio/esound/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/08/17 21:14:00 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/10/03 20:56:41 jlam Exp $
 #
 # This Makefile fragment is included by packages that use esound.
 #
@@ -33,6 +33,8 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.esound}
 
 BUILDLINK_CONFIG.esound=	${BUILDLINK_PREFIX.esound}/bin/esd-config
 BUILDLINK_CONFIG_WRAPPER.esound=	${BUILDLINK_DIR}/bin/esd-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.esound}|${BUILDLINK_CONFIG.esound}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 ESD_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.esound}
diff --git a/audio/libaudiofile/buildlink.mk b/audio/libaudiofile/buildlink.mk
index 004d7c4cbee..bbb99f83937 100644
--- a/audio/libaudiofile/buildlink.mk
+++ b/audio/libaudiofile/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/08/17 21:14:01 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/10/03 20:56:41 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libaudiofile.
 #
@@ -35,6 +35,8 @@ BUILDLINK_CONFIG.audiofile=	\
 			${BUILDLINK_PREFIX.audiofile}/bin/audiofile-config
 BUILDLINK_CONFIG_WRAPPER.audiofile=	\
 			${BUILDLINK_DIR}/bin/audiofile-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.audiofile}|${BUILDLINK_CONFIG.audiofile}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 AUDIOFILE_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.audiofile}
diff --git a/audio/libmikmod/buildlink.mk b/audio/libmikmod/buildlink.mk
index 88b472b70de..eaba346c7f0 100644
--- a/audio/libmikmod/buildlink.mk
+++ b/audio/libmikmod/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/08/17 21:14:02 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/10/03 20:56:42 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libmikmod.
 #
@@ -33,6 +33,8 @@ BUILDLINK_CONFIG.libmikmod=	\
 			${BUILDLINK_PREFIX.libmikmod}/bin/libmikmod-config
 BUILDLINK_CONFIG_WRAPPER.libmikmod=	\
 			${BUILDLINK_DIR}/bin/libmikmod-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.libmikmod}|${BUILDLINK_CONFIG.libmikmod}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 LIBMIKMOD_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.libmikmod}
diff --git a/audio/wsoundserver/buildlink.mk b/audio/wsoundserver/buildlink.mk
index a6d5a3be8b0..5976d6d8960 100644
--- a/audio/wsoundserver/buildlink.mk
+++ b/audio/wsoundserver/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/07/24 10:51:18 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/10/03 20:56:42 jlam Exp $
 #
 # This Makefile fragment is included by packages that use wsound.
 #
@@ -35,6 +35,8 @@ BUILDLINK_CONFIG.wsound=	\
 	${BUILDLINK_PREFIX.wsound}/bin/get-wsound-flags
 BUILDLINK_CONFIG_WRAPPER.wsound=	\
 	${BUILDLINK_DIR}/bin/get-wsound-flags
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.wsound}|${BUILDLINK_CONFIG.wsound}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 GET_WSOUND_FLAGS?=	${BUILDLINK_CONFIG_WRAPPER.wsound}
diff --git a/audio/xmms/buildlink.mk b/audio/xmms/buildlink.mk
index b7721de35e4..f40d8bb9538 100644
--- a/audio/xmms/buildlink.mk
+++ b/audio/xmms/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/08/23 14:16:10 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/10/03 20:56:43 jlam Exp $
 #
 # This Makefile fragment is included by packages that use xmms.
 #
@@ -33,6 +33,8 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.xmms}
 
 BUILDLINK_CONFIG.xmms=		${BUILDLINK_PREFIX.xmms}/bin/xmms-config
 BUILDLINK_CONFIG_WRAPPER.xmms=	${BUILDLINK_DIR}/bin/xmms-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.xmms}|${BUILDLINK_CONFIG.xmms}|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 XMMS_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.xmms}