summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2006-06-18 09:37:55 +0000
committerrillig <rillig@pkgsrc.org>2006-06-18 09:37:55 +0000
commitc25391175143901d154b96dcd159900c93d80093 (patch)
treeacf21121b0db16731121054a86d26e2817d5057c /mk
parent84f1fd3ebfde78e2e21d6ecd30905ebf3e87b146 (diff)
downloadpkgsrc-c25391175143901d154b96dcd159900c93d80093.tar.gz
Define CONFIG_{GUESS,SUB,RPATH}_OVERRIDE also when
OVERRIDE_GNU_CONFIG_SCRIPTS is defined.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk18
1 files changed, 11 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index b8b1301ba8d..a11ea8b3f9b 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -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 @@ GNU_CONFIGURE_MANDIR?= ${GNU_CONFIGURE_PREFIX}/${PKGMANDIR}
. 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_GUESS_OVERRIDE?= \
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
#