summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/bsd.pkg.mk33
1 files changed, 24 insertions, 9 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index dc3aaff2ac9..e22fb19ec07 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.870 2001/11/30 03:48:14 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.871 2001/11/30 05:03:06 jlam Exp $
#
# This file is in the public domain.
#
@@ -1511,6 +1511,14 @@ do-patch: uptodate-digest
# Configure
+# _CONFIGURE_PREREQ is a list of targets to run after pre-configure but before
+# do-configure. These targets typically edit the files used by the
+# do-configure target.
+#
+# _CONFIGURE_POSTREQ is a list of targets to run after do-configure but before
+# post-configure. These targets typically edit the files generated by
+# the do-configure target that are used during the build phase.
+
_CONFIGURE_PREREQ+= replace-perl
replace-perl:
.if defined(REPLACE_PERL)
@@ -1586,17 +1594,24 @@ do-configure: ${_CONFIGURE_PREREQ}
. if defined(USE_IMAKE)
${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} XPROJECTROOT=${X11BASE} ${XMKMF}
. endif
-. if defined(USE_LIBTOOL) && defined(LIBTOOL_OVERRIDE)
-. for libtool in ${LIBTOOL_OVERRIDE}
- ${_PKG_SILENT}${_PKG_DEBUG}\
- if [ -f ${libtool} ]; then \
- ${RM} -f ${libtool}; \
- ${LN} -sf ${LIBTOOL} ${libtool}; \
+.endif
+
+_CONFIGURE_POSTREQ+= do-libtool-override
+do-libtool-override:
+.if defined(USE_LIBTOOL) && defined(LIBTOOL_OVERRIDE)
+. for libtool in ${LIBTOOL_OVERRIDE}
+ ${_PKG_SILENT}${_PKG_DEBUG} \
+ if [ -f ${libtool} ]; then \
+ ${RM} -f ${libtool}; \
+ ${LN} -sf ${LIBTOOL} ${libtool}; \
fi
-. endfor
-. endif
+. endfor
+.else
+ ${_PKG_SILENT}${_PKG_DEBUG}${TRUE}
.endif
+post-configure: ${_CONFIGURE_POSTREQ}
+
# Build
.if !target(do-build)