LIBTOOL_OVERRIDE and SHLIBTOOL_OVERRIDE are now lists of shell globs

relative to ${WRKSRC}.  Remove redundant LIBTOOL_OVERRIDE settings that
are automatically handled by the default setting in bsd.pkg.mk.

4 files changed, 6 insertions, 11 deletions

diff --git a/comms/gnome-pilot/Makefile b/comms/gnome-pilot/Makefile
index 43e5b769eea..73cd74a8a27 100644
--- a/comms/gnome-pilot/Makefile
+++ b/comms/gnome-pilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/03 18:49:35 reed Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:35 jlam Exp $
 #
 
 DISTNAME=		gnome-pilot-0.1.71
@@ -24,7 +24,6 @@ USE_PKGLOCALEDIR=	YES
 USE_LIBINTL=		YES
 USE_LIBTOOL=		YES
 USE_PERL5=		build
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 CONFIGURE_ARGS+=	--with-pisock=${LOCALBASE}
 
diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile
index ba73ed2a2c0..b8c525e4259 100644
--- a/comms/jpilot-syncmal/Makefile
+++ b/comms/jpilot-syncmal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/01/22 07:51:12 grant Exp $
+# $NetBSD: Makefile,v 1.22 2004/02/14 17:21:35 jlam Exp $
 
 DISTNAME=		jpilot-syncmal_0.71.2
 PKGNAME=		jpilot-syncmal-0.71.2
@@ -17,7 +17,7 @@ USE_X11=		# defined
 USE_GNU_TOOLS+=		make
 
 USE_LIBTOOL=		# defined
-SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+SHLIBTOOL_OVERRIDE=	libtool
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--enable-gtk2
diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index a10bb325a3d..b8d146f81a2 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2004/01/03 18:49:36 reed Exp $
+# $NetBSD: Makefile,v 1.39 2004/02/14 17:21:35 jlam Exp $
 #
 
 DISTNAME=		jpilot-0.99.5
@@ -16,6 +16,7 @@ DEPENDS+=		gnome-dirs>=1.0:../../misc/gnome-dirs
 CONFLICTS+=		jpilot-libplugin-[0-9]*
 
 USE_BUILDLINK2=		YES
+USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 
@@ -25,9 +26,6 @@ CONFIGURE_ARGS+=	--with-pilot-prefix="${BUILDLINK_PREFIX.pilot-link-libs}"
 CONFIGURE_ARGS+=	--enable-gtk2
 LDFLAGS+=		-export-dynamic
 
-USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 DOCDIR=			${PREFIX}/share/doc/jpilot
 INCDIR=			${PREFIX}/include/jpilot
 HTMLDIR=		${PREFIX}/share/doc/html/jpilot
diff --git a/comms/pilot-link/Makefile.common b/comms/pilot-link/Makefile.common
index 1df2a9b47e5..21ca1b00333 100644
--- a/comms/pilot-link/Makefile.common
+++ b/comms/pilot-link/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2003/07/17 21:26:54 grant Exp $
+# $NetBSD: Makefile.common,v 1.5 2004/02/14 17:21:35 jlam Exp $
 
 DISTNAME=		pilot-link-${PILOT_LINK_VERS}
 CATEGORIES=		comms
@@ -11,8 +11,6 @@ MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE?=		http://www.pilot-link.org/
 
 USE_LIBTOOL=		# defined
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 GNU_CONFIGURE=		# defined
 
 .include "../../mk/bsd.prefs.mk"