upstream

1 files changed, 22 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 34039b3860c..0232a3f8415 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2011-11-22  Glenn Morris  <rgm@gnu.org>
+
+        * configure.in (EMACSDATA, EMACSDOC): If set, print, since they can
+        have confusing effects on the build.  (Bug#6401)
+
+        * Makefile.in (install-arch-dep): Tweak previous change.
+
+2011-11-22  Yavor Doganov  <yavor@gnu.org>
+
+        Do not install arch-dependent files in the app bundle if
+        --disable-ns-self-contained is requested.  (Bug#1335)
+        * configure.in (exec_prefix, libexecdir): Define relative to
+        `ns_appbindir' only if configured for a self-contained app.
+        * Makefile.in (install-arch-dep): Test for the existence of
+        libexec in the Emacs.app bundle before executing commands.
+
+2011-11-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * configure.in: Remove reference to src/m/ibms390.h.
+
 2011-11-13  Glenn Morris  <rgm@gnu.org>
 
         * INSTALL: Tiny updates for disk space used during installation.
@@ -689,7 +709,7 @@
         * autogen/Makefile.in: Add auto-updated generated files.
         * autogen.sh: No longer a no-op, now it tests for autotools
         and runs them as necessary.
-        * configure.in: Defaule maintainer-mode to on.
+        * configure.in: Default maintainer-mode to on.
         * aclocal.m4, configure, lib/Makefile.in: Remove files.
 
 2011-03-13  Paul Eggert  <eggert@cs.ucla.edu>
@@ -9711,7 +9731,7 @@
         paths.h.in, Makefile.in in src.
 
         * configure: Delete .tmp files before creating them; don't bother
-        trying to make final targets writeable first, since it won't
+        trying to make final targets writable first, since it won't
         matter to move-if-change.
 
 1992-05-19  Jim Blandy  (jimb@pogo.cs.oberlin.edu)