upstream

1 files changed, 18 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 81eddade0a0..1d30382d34d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2012-10-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * configure.ac (_FORTIFY_SOURCE): Do not multiply define (Bug#12714).
+        This ports to Gentoo.  Problem originally reported against coreutils,
+        but Emacs has it too.
+
+2012-10-23  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (emacs_transform): Remove.
+        (install-man): Revert 2012-10-21 change.  (Bug#12713)
+
+2012-10-21  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (install-etc): Don't install emacs22 icons.
+
+        * Makefile.in (emacs_transform): New variable.
+        (install-etc): Prefer a make variable to a shell variable.
+
 2012-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * Makefile.in ($(MAKEFILE_NAME)): Depend on src/lisp.mk as well.