From 732964d7838ca5e8355397759068795660c65368 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Mon, 5 Feb 2001 09:00:54 +0000
Subject: Use full pathname "${LOCALBASE}/bin/auto..." in dependences and make
 targets. This includes a fix for PR pkg/12125 by Tomasz Luchowski.

---
 sysutils/apcupsd/Makefile     | 6 +++---
 sysutils/gnome-vfs/Makefile   | 8 ++++----
 sysutils/gtop/Makefile        | 6 +++---
 sysutils/ups-nut-cgi/Makefile | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 27f7a1f951f..22790539e4a 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/01/23 19:56:45 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/05 09:01:04 tron Exp $
 #
 
 DISTNAME=		apcupsd-3.6.2
@@ -8,7 +8,7 @@ MASTER_SITES=		ftp://ftp.oasi.gpa.it/pub/apcupsd/stable/tar/
 MAINTAINER=		bouyer@netbsd.org
 HOMEPAGE=		http://www.sibbald.com/apcupsd/
 
-BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=		${LOCALBASE}/bin/autoremake:../../devel/autoconf
 BUILD_DEPENDS+=		msgfmt:../../devel/gettext
 
 USE_GMAKE=		# defined
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--enable-nls		# i18n support
 CONFIGURE_ENV+=		CPFLAGS="${CPPFLAGS}"	# make sure libintl.h is found
 
 pre-configure:
-	cd ${WRKSRC} && autoreconf --force
+	cd ${WRKSRC} && ${LOCALBASE}/bin/autoremake --force
 
 # we should probably allow the tty to be set in /etc/mk.conf too
 #
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 392cd5aad5b..8339ac9e280 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/11/30 04:07:17 mycroft Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/05 09:01:04 tron Exp $
 #
 
 DISTNAME=	gnome-vfs-0.4.1
@@ -8,8 +8,8 @@ MASTER_SITES=	${MASTER_SITE_GNOME:=unstable/sources/gnome-vfs/}
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.gnome.org/
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
-BUILD_DEPENDS+=	${LOCALBASE}/bin/automake:../../devel/automake
+BUILD_DEPENDS+=	${LOCALBASE}/bin/${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+=	${LOCALBASE}/bin/${LOCALBASE}/bin/automake:../../devel/automake
 DEPENDS+=	GConf>=0.11:../../devel/GConf
 
 USE_X11BASE=	YES
@@ -20,6 +20,6 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=	YES
 
 pre-configure:
-	cd ${WRKSRC} && autoconf && automake
+	cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf && ${LOCALBASE}/bin/automake
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
index be2d3c09d63..6994ee05bd4 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/11/27 12:23:48 tron Exp $
+# $NetBSD: Makefile,v 1.11 2001/02/05 09:01:04 tron Exp $
 
 DISTNAME=		gtop-1.0.9
 CATEGORIES=		sysutils gnome
@@ -6,8 +6,8 @@ MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gtop/}
 
 MAINTAINER=		tron@netbsd.org
 
-BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
-BUILD_DEPENDS+=		automake:../../devel/automake
+BUILD_DEPENDS+=		${LOCALBASE}/bin/autoremake:../../devel/autoconf
+BUILD_DEPENDS+=		${LOCALBASE}/bin/automake:../../devel/automake
 BUILD_DEPENDS+=		msgfmt:../../devel/gettext
 BUILD_DEPENDS+=		gettextize:../../devel/gettext
 DEPENDS+=		gnome-core>=1.2.0:../../x11/gnome-core
diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile
index b29c0bf88f7..79131a877fa 100644
--- a/sysutils/ups-nut-cgi/Makefile
+++ b/sysutils/ups-nut-cgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/28 16:07:51 martin Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/05 09:01:04 tron Exp $
 #
 
 DISTNAME=		nut-0.44.2
@@ -11,7 +11,7 @@ HOMEPAGE=		http://www.exploits.org/nut/
 
 DEPENDS+=		gd-*:../../graphics/gd
 DEPENDS+=		ups-nut-0*:../ups-nut
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=		${LOCALBASE}/bin/${LOCALBASE}/bin/autoremake:../../devel/autoconf
 
 WRKSRC=			${WRKDIR}/nut-0.44.2
 
-- 
cgit v1.2.3