Use full pathname "${LOCALBASE}/bin/auto..." in dependences and make

targets. This includes a fix for PR pkg/12125 by Tomasz Luchowski.

5 files changed, 13 insertions, 13 deletions

diff --git a/cross/COMMON/cross.mk b/cross/COMMON/cross.mk
index e00480b034b..f9fe47f9e57 100644
--- a/cross/COMMON/cross.mk
+++ b/cross/COMMON/cross.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: cross.mk,v 1.19 2001/01/29 11:38:10 wiz Exp $
+#	$NetBSD: cross.mk,v 1.20 2001/02/05 09:00:54 tron Exp $
 
 # Shared definitions for building a cross-compile environment.
 
@@ -98,7 +98,7 @@ EGCS_INTVERSION=	egcs-2.91.60
 EGCS_PATCHBUNDLE=	${EGCS_DISTNAME}-NetBSD-19980104.diff.gz
 EGCS_WRKSRC=		${WRKDIR}/${EGCS_DISTNAME}
 EGCS_LANGUAGES=		c # add to these below
-BUILD_DEPENDS+= autoheader:../../devel/autoconf
+BUILD_DEPENDS+= ${LOCALBASE}/bin/autoheader:../../devel/autoconf
 
 .if defined(EGCS_MULTILIB)
 EGCS_INSTALL_LIB=install-multilib
diff --git a/cross/armv2-netbsd/Makefile b/cross/armv2-netbsd/Makefile
index 84679b8076a..0dca407f206 100644
--- a/cross/armv2-netbsd/Makefile
+++ b/cross/armv2-netbsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/07/13 21:39:11 bjh21 Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/05 09:00:55 tron Exp $
 #
 
 DISTVERSION=		1.3.0.0
@@ -17,12 +17,12 @@ EGCS_FAKE_RUNTIME=	yes
 
 TARGET_ARCH=		armv2-netbsd
 
-BUILD_DEPENDS+=		autoconf:../../devel/autoconf
+BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
 
 post-patch: egcs-autoconf
 
-egcs-autoconf:
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/gcc && autoconf
+egcs-${LOCALBASE}/bin/autoconf:
+	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/gcc && ${LOCALBASE}/bin/autoconf
 
 # FOllowing chunk ripped from cross.mk
 
diff --git a/cross/i386-linux/Makefile b/cross/i386-linux/Makefile
index 8f8728342bf..285bb749119 100644
--- a/cross/i386-linux/Makefile
+++ b/cross/i386-linux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/09/13 13:51:29 fredb Exp $
+# $NetBSD: Makefile,v 1.7 2001/02/05 09:00:55 tron Exp $
 #
 
 DISTVERSION=		2.0.7.1
@@ -9,7 +9,7 @@ MASTER_SITES=		ftp://ftp.cdrom.com/pub/linux/redhat/redhat-5.1/i386/RedHat/RPMS/
 MAINTAINER=		packages@netbsd.org
 
 BUILD_DEPENDS+=		rpm2cpio:../../misc/rpm
-BUILD_DEPENDS+=		autoheader:../../devel/autoconf
+BUILD_DEPENDS+=		${LOCALBASE}/bin/autoheader:../../devel/autoconf
 
 CHECK_SHLIBS=		no
 WRKSRC=			${WRKDIR}
diff --git a/cross/i386-netbsdpe/Makefile b/cross/i386-netbsdpe/Makefile
index 3354fcf7836..5c9fb63edc4 100644
--- a/cross/i386-netbsdpe/Makefile
+++ b/cross/i386-netbsdpe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/01/30 03:08:56 minoura Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/05 09:00:55 tron Exp $
 #
 
 DISTVERSION=		1.1.2
@@ -39,9 +39,9 @@ post-patch:
 	for i in patches/binutils-*; do \
 		${PATCH} -d ${BINUTILS_WRKSRC} --forward --quiet -E < $$i; \
 	done
-	cd ${BINUTILS_WRKSRC}/bfd && autoconf
-	cd ${BINUTILS_WRKSRC}/gas && autoconf
-	cd ${WRKDIR}/${GCC_DISTNAME}/gcc && autoconf
+	cd ${BINUTILS_WRKSRC}/bfd && ${LOCALBASE}/bin/autoconf
+	cd ${BINUTILS_WRKSRC}/gas && ${LOCALBASE}/bin/autoconf
+	cd ${WRKDIR}/${GCC_DISTNAME}/gcc && ${LOCALBASE}/bin/autoconf
 	cd ${WRKDIR} && /usr/bin/tar zxf ${_DISTDIR}/${PTHREAD_DISTFILE}
 	cd ${WRKDIR}/${GCC_DISTNAME}/gcc && \
 		${LN} -s ../../${PTHREAD_DISTNAME}/include/pthread.h . && \
diff --git a/cross/i386-netbsdpe/files/cross.mk b/cross/i386-netbsdpe/files/cross.mk
index 1c9bb1e3978..90fe18341f1 100644
--- a/cross/i386-netbsdpe/files/cross.mk
+++ b/cross/i386-netbsdpe/files/cross.mk
@@ -99,7 +99,7 @@ GCC_INTVERSION=		2.95.2
 #EGCS_PATCHBUNDLE=	${EGCS_DISTNAME}-NetBSD-19980104.diff.gz
 GCC_WRKSRC=		${WRKDIR}/${GCC_DISTNAME}
 GCC_LANGUAGES=		c # add to these below
-BUILD_DEPENDS+= autoheader:../../devel/autoconf
+BUILD_DEPENDS+= ${LOCALBASE}/bin/autoheader:../../devel/autoconf
 
 .if defined(GCC_NO_RUNTIME) || defined(GCC_FAKE_RUNTIME)
 GCC_NO_CXX_RUNTIME=	yes