diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2020-07-20 15:10:33 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-07-20 15:13:34 -0700 |
| commit | 96f0001bcda3ba9bed7eb13257842e556dbc4695 (patch) | |
| tree | 285f06d8e9843407d7ac6ecf2a009a4ac96d7a71 | |
| parent | 14d58bfd58121c31e65ca68fcde3023545f76c1b (diff) | |
| download | autoconf-96f0001bcda3ba9bed7eb13257842e556dbc4695.tar.gz | |
Don’t assume plain ‘make’ in C unit tests
Problem reported by Bruno Haible in:
https://savannah.gnu.org/support/?110273#comment6
* lib/autoconf/general.m4 (_AC_ARG_VAR_VALIDATE):
* tests/autotest.at (C unit tests, C unit tests (EXEEXT)):
Prefer ‘${MAKE-make}’ to ‘make’ in shell code.
| -rw-r--r-- | lib/autoconf/general.m4 | 3 | ||||
| -rw-r--r-- | tests/autotest.at | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index e725d88c..8436d8c3 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -1650,7 +1650,8 @@ done if $ac_cache_corrupted; then AS_MESSAGE([error: in `$ac_pwd':], 2) AS_MESSAGE([error: changes in the environment can compromise the build], 2) - AS_ERROR([run `make distclean' and/or `rm $cache_file' and start over]) + AS_ERROR([run `${MAKE-make} distclean' and/or `rm $cache_file' + and start over]) fi])dnl ])# _AC_ARG_VAR_VALIDATE diff --git a/tests/autotest.at b/tests/autotest.at index 7d09ae37..d30e3df4 100644 --- a/tests/autotest.at +++ b/tests/autotest.at @@ -1935,7 +1935,7 @@ rm t/atconfig AT_CHECK_AUTOCONF AT_CHECK_CONFIGURE AT_CHECK([grep '^EXEEXT='\''.*'\' t/atconfig], [], [ignore]) -AT_CHECK([make], [], [ignore]) +AT_CHECK([${MAKE-make}], [], [ignore]) AT_CHECK([cd t && $CONFIG_SHELL ./suite], [], [ignore]) AT_CHECK([grep 1.*successful t/suite.log], [], [ignore]) AT_CLEANUP @@ -1996,7 +1996,7 @@ rm t/atconfig AT_CHECK_AUTOCONF AT_CHECK_CONFIGURE AT_CHECK([grep '^EXEEXT='\''.*'\' t/atconfig], [], [ignore]) -AT_CHECK([make], [], [ignore]) +AT_CHECK([${MAKE-make}], [], [ignore]) AT_CHECK([cd t && $CONFIG_SHELL ./suite], [], [ignore]) AT_CHECK([grep 1.*successful t/suite.log], [], [ignore]) AT_CLEANUP |