aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2014-03-27 14:29:32 -0700
committerPaul Eggert2014-03-27 14:29:32 -0700
commitef9b8f2d5394f88e2170e417750ae2cc4777eb43 (patch)
tree8692c992181b986f598de789957d00299aa2ed80
parent862a4e4ae76df49444489108d2a58f9cfc36fad7 (diff)
downloademacs-ef9b8f2d5394f88e2170e417750ae2cc4777eb43.tar.gz
emacs-ef9b8f2d5394f88e2170e417750ae2cc4777eb43.zip
* configure.ac: Suggest './configure MAKE=gmake' in diagnostic.
This tends to work better than 'MAKE=gmake ./configure' if later builds run config.status etc.
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b19428baa99..adc1768b0ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
12014-03-27 Paul Eggert <eggert@cs.ucla.edu>
2
3 * configure.ac: Suggest './configure MAKE=gmake' in diagnostic.
4 This tends to work better than 'MAKE=gmake ./configure' if later
5 builds run config.status etc.
6
12014-03-27 Glenn Morris <rgm@gnu.org> 72014-03-27 Glenn Morris <rgm@gnu.org>
2 8
3 * configure.ac: Require GNU make. 9 * configure.ac: Require GNU make.
diff --git a/configure.ac b/configure.ac
index 73b385f28ca..e1d6fc249a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -665,8 +665,8 @@ if test "x$testval" != x; then
665else 665else
666 AC_MSG_RESULT([no]) 666 AC_MSG_RESULT([no])
667 AC_MSG_ERROR([Building Emacs requires GNU make. 667 AC_MSG_ERROR([Building Emacs requires GNU make.
668If you have it installed under a name other than 'make', 668If you have it installed under another name, configure with 'MAKE=...'.
669set the MAKE environment variable, and try again.]) 669For example, run './configure MAKE=gmake'.])
670fi 670fi
671 671
672 672