Sun Apr 28 13:18:18 2019 UTC ()
mk/configure: when there are multiple CONFIGURE_DIRS, print current dir

This helps to find out which of the several configure scripts has
problems, for example when checking for unknown command line options
using GNU_CONFIGURE_STRICT.


(rillig)
diff -r1.27 -r1.28 pkgsrc/mk/configure/configure.mk
cvs diff -r1.27 -r1.28 pkgsrc/mk/configure/configure.mk (expand / switch to unified diff)

--- pkgsrc/mk/configure/configure.mk 2019/04/28 11:25:32 1.27
+++ pkgsrc/mk/configure/configure.mk 2019/04/28 13:18:18 1.28
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: configure.mk,v 1.27 2019/04/28 11:25:32 rillig Exp $ 1# $NetBSD: configure.mk,v 1.28 2019/04/28 13:18:18 rillig Exp $
2# 2#
3# = Package-settable variables = 3# = Package-settable variables =
4# 4#
5# CONFIGURE_ENV is the shell environment that is exported to the 5# CONFIGURE_ENV is the shell environment that is exported to the
6# configure script. 6# configure script.
7# 7#
8# CONFIG_SHELL is the shell that is used for interpreting the 8# CONFIG_SHELL is the shell that is used for interpreting the
9# configure script. 9# configure script.
10# 10#
11# CONFIGURE_SCRIPT is the path to the script to run in order to 11# CONFIGURE_SCRIPT is the path to the script to run in order to
12# configure the software for building. If the path is relative, 12# configure the software for building. If the path is relative,
13# then it is assumed to be relative to each directory listed in 13# then it is assumed to be relative to each directory listed in
14# CONFIGURE_DIRS. 14# CONFIGURE_DIRS.
@@ -196,26 +196,29 @@ do-configure-post-hook: @@ -196,26 +196,29 @@ do-configure-post-hook:
196### software for building. 196### software for building.
197### 197###
198_CONFIGURE_SCRIPT_ENV+= INSTALL=${INSTALL:Q}\ -c\ -o\ ${BINOWN}\ -g\ ${BINGRP} 198_CONFIGURE_SCRIPT_ENV+= INSTALL=${INSTALL:Q}\ -c\ -o\ ${BINOWN}\ -g\ ${BINGRP}
199_CONFIGURE_SCRIPT_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} 199_CONFIGURE_SCRIPT_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q}
200_CONFIGURE_SCRIPT_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} 200_CONFIGURE_SCRIPT_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
201_CONFIGURE_SCRIPT_ENV+= INSTALL_DATA=${INSTALL_DATA:Q} 201_CONFIGURE_SCRIPT_ENV+= INSTALL_DATA=${INSTALL_DATA:Q}
202_CONFIGURE_SCRIPT_ENV+= INSTALL_GAME=${INSTALL_GAME:Q} 202_CONFIGURE_SCRIPT_ENV+= INSTALL_GAME=${INSTALL_GAME:Q}
203_CONFIGURE_SCRIPT_ENV+= INSTALL_GAME_DATA=${INSTALL_GAME_DATA:Q} 203_CONFIGURE_SCRIPT_ENV+= INSTALL_GAME_DATA=${INSTALL_GAME_DATA:Q}
204_CONFIGURE_SCRIPT_ENV+= ${CONFIGURE_ENV} 204_CONFIGURE_SCRIPT_ENV+= ${CONFIGURE_ENV}
205 205
206.PHONY: do-configure-script 206.PHONY: do-configure-script
207do-configure-script: 207do-configure-script:
208.for _dir_ in ${CONFIGURE_DIRS} 208.for _dir_ in ${CONFIGURE_DIRS}
 209. if ${CONFIGURE_DIRS:[#]} != 1
 210 ${RUN} ${STEP_MSG} "Running "${CONFIGURE_SCRIPT:Q}" in "${_dir_:Q}
 211. endif
209 ${RUN}${_ULIMIT_CMD} \ 212 ${RUN}${_ULIMIT_CMD} \
210 cd ${WRKSRC} && cd ${_dir_} && \ 213 cd ${WRKSRC} && cd ${_dir_} && \
211 ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} \ 214 ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} \
212 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \ 215 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \
213 ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} 216 ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
214.endfor 217.endfor
215 218
216###################################################################### 219######################################################################
217### do-configure-imake (PRIVATE) 220### do-configure-imake (PRIVATE)
218###################################################################### 221######################################################################
219### do-configure-imake runs xmkmf and imake to configure the software 222### do-configure-imake runs xmkmf and imake to configure the software
220### for building. 223### for building.
221### 224###