summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>2004-02-11 01:07:37 +0000
committerjlam <jlam>2004-02-11 01:07:37 +0000
commit7ee31907170fc2eace92fdaeb3a2aaadd15768fb (patch)
tree92d370368b57d8d17a67a6e53d7a37d120f8e826
parent2c9eb1fe9e249dbcdb947175562eaa07f690211e (diff)
downloadpkgsrc-7ee31907170fc2eace92fdaeb3a2aaadd15768fb.tar.gz
Defer creating the auto* stubs until just before we enter the build phase.
This allows any autoconf/automake we execute at pre-configure time to find its own scripts, yet still prevents "make build" from clobbering any changes we may have made.
-rw-r--r--mk/tools.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/tools.mk b/mk/tools.mk
index 357dec7547f..95f337fcd9a 100644
--- a/mk/tools.mk
+++ b/mk/tools.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.mk,v 1.25 2004/02/06 04:37:02 jlam Exp $
+# $NetBSD: tools.mk,v 1.26 2004/02/11 01:07:37 jlam Exp $
#
# This Makefile creates a ${TOOLS_DIR} directory and populates the bin
# subdir with tools that hide the ones outside of ${TOOLS_DIR}.
@@ -53,9 +53,11 @@ _HIDE_PROGS.automake= bin/aclocal bin/aclocal-1.4 \
bin/automake-1.8
.if empty(AUTOMAKE_OVERRIDE:M[nN][oO])
+.PHONY: pre-build override-autotools
+pre-build: override-autotools
. for _autotool_ in autoconf automake
. for _prog_ in ${_HIDE_PROGS.${_autotool_}}
-override-tools: ${TOOLS_DIR}/${_prog_}
+override-autotools: ${TOOLS_DIR}/${_prog_}
${TOOLS_DIR}/${_prog_}: ${_GNU_MISSING}
${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
${_PKG_SILENT}${_PKG_DEBUG} \