[pkgsrc/trunk]: pkgsrc/mk Define CONFIG_{GUESS,SUB,RPATH}_OVERRIDE also when

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c15c17837d1b
branches:  trunk
changeset: 514815:c15c17837d1b
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Jun 18 09:37:55 2006 +0000

description:
Define CONFIG_{GUESS,SUB,RPATH}_OVERRIDE also when
OVERRIDE_GNU_CONFIG_SCRIPTS is defined.

diffstat:

 mk/bsd.pkg.mk |  18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diffs (39 lines):

diff -r 5f28dfc0776b -r c15c17837d1b mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sun Jun 18 09:34:07 2006 +0000
+++ b/mk/bsd.pkg.mk     Sun Jun 18 09:37:55 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1855 2006/06/18 09:34:07 rillig Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1856 2006/06/18 09:37:55 rillig Exp $
 #
 # This file is in the public domain.
 #
@@ -478,6 +478,16 @@
 .  if !empty(CONFIGURE_HAS_MANDIR:M[yY][eE][sS])
 CONFIGURE_ARGS+=       --mandir=${GNU_CONFIGURE_MANDIR:Q}
 .  endif
+
+#
+# By default, override GNU configure scripts so that the generated
+# config.status scripts never do anything on "recheck".
+#
+CONFIGURE_SCRIPTS_OVERRIDE?=   \
+       configure */configure */*/configure
+.endif
+
+.if defined(GNU_CONFIGURE) || defined(OVERRIDE_GNU_CONFIG_SCRIPTS)
 #
 # By default, override config.guess and config.sub for GNU configure
 # packages. pkgsrc's updated versions of these scripts allows GNU
@@ -488,12 +498,6 @@
 CONFIG_SUB_OVERRIDE?=          \
        config.sub */config.sub */*/config.sub
 CONFIG_RPATH_OVERRIDE?=                # set by platform file as needed
-#
-# By default, override GNU configure scripts so that the generated
-# config.status scripts never do anything on "recheck".
-#
-CONFIGURE_SCRIPTS_OVERRIDE?=   \
-       configure */configure */*/configure
 .endif
 
 #