aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2014-08-30 19:34:31 -0700
committerPaul Eggert2014-08-30 19:34:31 -0700
commitced5a8f219b31402480b60c370d0045afe74a531 (patch)
tree1b7c9e3be1972f3060547a4c8ec1696c880abec9
parent0ac6761dfb5a9d867769de75a48edf1844e297cc (diff)
downloademacs-ced5a8f219b31402480b60c370d0045afe74a531.tar.gz
emacs-ced5a8f219b31402480b60c370d0045afe74a531.zip
* configure.ac (MAKE): Export it, for config.status.
Needed on AIX when 'configure' infers MAKE=gmake.
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f0127755aa..b61def192ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12014-08-31 Paul Eggert <eggert@cs.ucla.edu>
2
3 * configure.ac (MAKE): Export it, for config.status.
4 Needed on AIX when 'configure' infers MAKE=gmake.
5
12014-08-30 Paul Eggert <eggert@cs.ucla.edu> 62014-08-30 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Vector-sorting fixes (Bug#18361). 8 Vector-sorting fixes (Bug#18361).
diff --git a/configure.ac b/configure.ac
index 4f17a55895e..32a55fc46e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,6 +130,7 @@ If you have it installed under another name, configure with 'MAKE=...'.
130For example, run '$0 MAKE=gnu-make'.]]) 130For example, run '$0 MAKE=gnu-make'.]])
131} 131}
132MAKE=$ac_cv_path_MAKE 132MAKE=$ac_cv_path_MAKE
133export MAKE
133 134
134dnl Fairly arbitrary, older versions might work too. 135dnl Fairly arbitrary, older versions might work too.
135AM_INIT_AUTOMAKE(1.11) 136AM_INIT_AUTOMAKE(1.11)