Merge from emacs-24; up to 2012-04-22T13:58:00Z!cyd@gnu.org

[bpt/emacs.git] / doc / misc / ChangeLog

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 312b2d1..812ec02 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,5 +1,23 @@
+2012-05-12  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * cc-mode.texi: Avoid space before macro in 4th argument of cross
+       reference commands.  (Bug#11461)
+
+       * Makefile.in (gnus.dvi): Use $@ instead of $*.dvi.
+
 2012-05-12  Glenn Morris  <rgm@gnu.org>
 
+       * Makefile.in (mostlyclean): Add more TeX intermediates.
+
+       * Makefile.in: Make it look more like the other doc Makefiles.
+       Use explicit $srcdir in all dependencies.
+       Remove cd $srcdir from rules.
+       (VPATH): Remove.
+       (infodir): Set to an absolute path.
+       (INFO_TARGETS): Use short names.
+       (mkinfodir): infodir is now absolute.
+       (echo-info, maintainer-clean): Update for new format of INFO_TARGETS.
+
        * Makefile.in (info.info): Rename from info, to avoid duplication.
        (.SUFFIXES): Disable implicit rules.