By default, prevent invocation of GNU "auto*" driven by the generated

Makefiles during the build process by touching various auto{conf,make}
source files to make them up-to-date.  Packages that require regenerating
the configure script and Makefile.in files should make the appropriate
calls to auto{conf,make} in a pre-configure target.  This allows the
various targets listed in ${_CONFIG_PREREQ} to modify the generated files
without triggering the GNU auto* tools and having the modifications be
overwritten.

14 files changed, 22 insertions, 34 deletions

diff --git a/chat/kyahoo/Makefile b/chat/kyahoo/Makefile
index 2ecccbffd9a..003b3c61243 100644
--- a/chat/kyahoo/Makefile
+++ b/chat/kyahoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/11/13 21:12:44 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/12/04 06:14:58 jlam Exp $
 
 DISTNAME=	kyahoo-0.7
 CATEGORIES=	chat kde
@@ -10,7 +10,6 @@ HOMEPAGE=	http://kyahoo.sourceforge.net/
 COMMENT=	Yahoo! client for KDE
 
 USE_BUILDLINK_ONLY=	YES
-AUTOMAKE_OVERRIDE=	YES
 USE_GMAKE=              YES
 
 GNU_CONFIGURE=          YES
diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile
index a1bc5694a8a..4dc2c423875 100644
--- a/databases/kmysqladmin/Makefile
+++ b/databases/kmysqladmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/11/13 21:13:38 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/12/04 06:14:58 jlam Exp $
 
 DISTNAME=	kmysqladmin-0.5.1
 CATEGORIES=	databases kde
@@ -8,9 +8,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=       http://www.webeifer.de/alwin/programs/kmysqladmin/
 COMMENT=	MySQL administration GUI
 
-AUTOMAKE_OVERRIDE=	YES
 USE_BUILDLINK_ONLY=	YES
-
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-mysql-includes=${BUILDLINK_DIR}/include/mysql
 CONFIGURE_ARGS+=	--with-mysql-libs=${BUILDLINK_DIR}/lib/mysql
diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile
index a38fa3ee12f..d5df6c42b3e 100644
--- a/devel/cscope/Makefile
+++ b/devel/cscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/10/29 10:24:16 seb Exp $
+# $NetBSD: Makefile,v 1.19 2001/12/04 06:14:59 jlam Exp $
 #
 
 DISTNAME=	cscope-15.3
@@ -14,7 +14,6 @@ USE_BUILDLINK_ONLY=	YES
 
 CONFIGURE_ARGS+=	--with-ncurses=${BUILDLINK_DIR}
 CONFIGURE_ARGS+=	--with-flex
-AUTOMAKE_OVERRIDE=	YES
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index d807e35cf6a..7351f4ece04 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/11/22 17:50:22 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2001/12/04 06:14:59 jlam Exp $
 # FreeBSD Id: Makefile,v 1.4 1996/11/18 10:22:47 asami Exp
 #
 
@@ -15,7 +15,6 @@ USE_BUILDLINK_ONLY=	yes
 
 INFO_FILES=	id-utils.info
 GNU_CONFIGURE=	yes
-AUTOMAKE_OVERRIDE=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/games/knights/Makefile b/games/knights/Makefile
index d2eae9352c5..517413a9948 100644
--- a/games/knights/Makefile
+++ b/games/knights/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/12/02 18:53:23 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/04 06:14:59 jlam Exp $
 
 DISTNAME=	knights-0.4.6
 CATEGORIES=	games kde
@@ -15,7 +15,6 @@ GNU_CONFIGURE=          YES
 USE_LIBTOOL=            YES
 LTCONFIG_OVERRIDE=      ${WRKSRC}/admin/ltconfig
 
-AUTOMAKE_OVERRIDE=	YES
 MEINPROC=		${BUILDLINK_PREFIX.kdelibs2}/bin/meinproc
 DOCDIR=			${PREFIX}/share/doc/kde/HTML/en/knights
 
diff --git a/misc/ktail/Makefile b/misc/ktail/Makefile
index f7a564093b7..5e1b42dbeda 100644
--- a/misc/ktail/Makefile
+++ b/misc/ktail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/11/13 21:25:13 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/04 06:14:59 jlam Exp $
 
 DISTNAME=	ktail-0.5.1
 CATEGORIES=	misc kde
@@ -11,7 +11,6 @@ COMMENT=	ktail monitors multiple files and/or command output in one window
 BUILD_DEPENDS+=	qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
 
 BUILD_USES_MSGFMT=      YES
-AUTOMAKE_OVERRIDE=	YES
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index cec99823907..9bb4eb8367a 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.873 2001/12/02 21:29:21 wiz Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.874 2001/12/04 06:14:57 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -1558,15 +1558,17 @@ do-ltconfig-override:
 	${_PKG_SILENT}${_PKG_DEBUG}${TRUE}
 .endif
 
-.if defined(AUTOMAKE_OVERRIDE) && (${AUTOMAKE_OVERRIDE} == "YES")
-#
-# Prevent invocation of GNU "auto*" during the build process driven by the
-# generated Makefiles by touching various auto{conf,make} source files to
-# make them up-to-date.
+# By default, prevent invocation of GNU "auto*" driven by the generated
+# Makefiles during the build process by touching various auto{conf,make}
+# source files to make them up-to-date.  Packages that require regenerating
+# the configure script and Makefile.in files should make the appropriate
+# calls to auto{conf,make} in a pre-configure target.
 #
+AUTOMAKE_OVERRIDE?=	YES
+.if defined(AUTOMAKE_OVERRIDE) && (${AUTOMAKE_OVERRIDE} == "YES")
 AUTOMAKE_PATTERNS+=	*.m4
 AUTOMAKE_PATTERNS+=	*.in
-AUTOMAKE_PATTERNS+=	configure
+AUTOMAKE_PATTERNS+=	${CONFIGURE_SCRIPT:T}*
 _AUTOMAKE_PATTERNS_FIND=	\
 	\( ${AUTOMAKE_PATTERNS:S/$/!/:S/^/-o -name !/:S/!/"/g:S/-o//1} \)
 
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index e14d6eb3287..d10aa3156e9 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/11/29 01:12:42 hubertf Exp $
+# $NetBSD: Makefile,v 1.22 2001/12/04 06:15:00 jlam Exp $
 #
 
 DISTNAME=	mtr-0.42
@@ -11,7 +11,6 @@ MAINTAINER=	sommerfeld@netbsd.org
 HOMEPAGE=	http://www.bitwizard.nl/mtr/
 COMMENT=	Traceroute and ping in a single graphical network diagnostic tool
 
-AUTOMAKE_OVERRIDE=	YES
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
 USE_BUILDLINK_ONLY=	YES
diff --git a/net/wget/Makefile b/net/wget/Makefile
index 468ac380b28..fcf480d2f26 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2001/10/26 21:53:01 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2001/12/04 06:15:00 jlam Exp $
 
 DISTNAME=	wget-1.7
 CATEGORIES=	net
@@ -16,7 +16,6 @@ BUILD_DEPENDS+=	perl>=${PERL5_REQD}:../../lang/perl5
 
 BUILD_USES_MSGFMT=	YES
 USE_BUILDLINK_ONLY=	YES
-AUTOMAKE_OVERRIDE=	YES
 
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 6365267aad3..56a242b2d42 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/12/02 06:56:43 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2001/12/04 06:15:00 jlam Exp $
 
 DISTNAME=		cyrus-sasl-1.5.24
 PKGREVISION=		3
@@ -13,7 +13,6 @@ COMMENT=		Simple Authentication and Security Layer
 
 BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 
-AUTOMAKE_OVERRIDE=	YES
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
diff --git a/sysutils/koncd/Makefile b/sysutils/koncd/Makefile
index e374c9a2885..99841163d61 100644
--- a/sysutils/koncd/Makefile
+++ b/sysutils/koncd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/13 21:26:58 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/12/04 06:15:00 jlam Exp $
 
 DISTNAME=	koncd-0.7.1
 CATEGORIES=	sysutils
@@ -12,7 +12,6 @@ BUILD_DEPENDS+=	qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
 DEPENDS+=	cdrecord>=1.9:../../sysutils/cdrecord
 
 USE_BUILDLINK_ONLY=	YES
-AUTOMAKE_OVERRIDE=	YES
 GNU_CONFIGURE=		YES
 
 .include "../../x11/kde2/buildlink.mk"
diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile
index bd44e7bf6c0..c80479b8b9f 100644
--- a/textproc/gsed/Makefile
+++ b/textproc/gsed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/29 12:30:06 seb Exp $
+# $NetBSD: Makefile,v 1.4 2001/12/04 06:15:01 jlam Exp $
 #
 
 DISTNAME=	sed-3.02
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.gnu.org/software/sed/sed.html
 COMMENT=	GNU version of sed
 
 GNU_CONFIGURE=	YES
-AUTOMAKE_OVERRIDE=	YES
 CONFIGURE_ARGS= --program-prefix=g
 INFO_FILES=	sed.info
 AUTOMAKE_PATTERNS+=	sed.info version.texi stamp-vti
diff --git a/www/quanta/Makefile b/www/quanta/Makefile
index 5e8cecd104d..8fe0e19a0d2 100644
--- a/www/quanta/Makefile
+++ b/www/quanta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/12/03 16:16:31 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/12/04 06:15:01 jlam Exp $
 
 DISTNAME=	quanta-2.0-pr2
 PKGNAME=	quanta-1.9.9.2
@@ -16,7 +16,6 @@ BUILD_DEPENDS+=	perl>=${PERL5_REQD}:../../lang/perl5
 
 BUILD_USES_MSGFMT=	YES
 USE_BUILDLINK_ONLY=	YES
-AUTOMAKE_OVERRIDE=	YES
 
 USE_GMAKE=              YES
 GNU_CONFIGURE=          YES
diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index d2697f064d5..fb118d5728f 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/12/02 06:56:47 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/12/04 06:15:01 jlam Exp $
 #
 
 DISTNAME=	surfraw-1.0.5
@@ -12,7 +12,6 @@ COMMENT=	Shell Users' Revolutionary Front Rage Against the Web
 CONFLICTS+=	surfaw-[0-9]*
 
 USE_BUILDLINK_ONLY=	YES
-AUTOMAKE_OVERRIDE=	YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}