Mercurial > emacs

diff msdos/ChangeLog @ 108298:ffcbc15ab440

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix MS-DOS configuring in lib-src/ and src/, broken by autoconfiscation. src/Makefile.in: Don't use Make-style comments past the "start of cpp stuff" line. (MSDOS_OBJ): Remove xmenu.o (it is now defined by XMENU_OBJ). src/s/msdos.h (UNEXEC): Don't define (@unexec@ in Makefile.in is edited directly by msdos/sed1v2.inp). msdos/sed3v2.inp (C_SWITCH_MACHINE): Edit to empty. msdos/sed1v2.inp (@LIB_MATH@): Edit to -lm. (C_SWITCH_MACHINE, C_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_TEMACS) (LD_SWITCH_X_SITE_AUX, LD_SWITCH_X_SITE_AUX_RPATH) (LD_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_EXTRA, LIBTIFF, LIBJPEG) (LIBPNG, LIBGIF, LIBXPM, XFT_LIBS, DBUS_CFLAGS, DBUS_LIBS) (DBUS_OBJ, GCONF_CFLAGS, GCONF_LIBS, GTK_OBJ, LIBXMU, LIBXSM) (LIBXTR6, XOBJ, TOOLKIT_LIBW, WIDGET_OBJ, CYGWIN_OBJ, NS_OBJ) (NS_SUPPORT, LIBSELINUX_LIBS, START_FILES): Edit to empty. (XMENU_OBJ): Edit to xmenu.o. (FONT_OBJ): Edit to value used for X on Unix. (PRE_ALLOC_OBJ): Edit to lastfile.o. (POST_ALLOC_OBJ): Edit to $(vmlimitobj). (@unexec@): Edit to unexec.o.
author Eli Zaretskii <eliz@gnu.org>
date Fri, 07 May 2010 15:57:24 +0300
parents 39e86d46390a
children 17d73312ed65
line wrap: on
line diff
--- a/msdos/ChangeLog	Fri May 07 14:21:29 2010 +0300
+++ b/msdos/ChangeLog	Fri May 07 15:57:24 2010 +0300
@@ -1,3 +1,23 @@
+2010-05-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix breakage due to autoconfiscation of Makefile.in files.
+
+	* sed3v2.inp (C_SWITCH_MACHINE): Edit to empty.
+
+	* sed1v2.inp (@LIB_MATH@): Edit to -lm.
+	(C_SWITCH_MACHINE, C_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_TEMACS)
+	(LD_SWITCH_X_SITE_AUX, LD_SWITCH_X_SITE_AUX_RPATH)
+	(LD_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_EXTRA, LIBTIFF, LIBJPEG)
+	(LIBPNG, LIBGIF, LIBXPM, XFT_LIBS, DBUS_CFLAGS, DBUS_LIBS)
+	(DBUS_OBJ, GCONF_CFLAGS, GCONF_LIBS, GTK_OBJ, LIBXMU, LIBXSM)
+	(LIBXTR6, XOBJ, TOOLKIT_LIBW, WIDGET_OBJ, CYGWIN_OBJ, NS_OBJ)
+	(NS_SUPPORT, LIBSELINUX_LIBS, START_FILES): Edit to empty.
+	(XMENU_OBJ): Edit to xmenu.o.
+	(FONT_OBJ): Edit to value used for X on Unix.
+	(PRE_ALLOC_OBJ): Edit to lastfile.o.
+	(POST_ALLOC_OBJ): Edit to $(vmlimitobj).
+	(@unexec@): Edit to unexec.o.
+
 2010-05-06  Glenn Morris  <rgm@gnu.org>
 
 	* sed1v2.inp, sed5x.inp: Remove LN_S, unused.