From: Glenn Morris <rgm@gnu.org>
Date: Tue, 11 May 2010 03:10:36 +0000 (-0700)
Subject: * make-dist (msdos): No more mainmake.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~211^2~19
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=edf77e4e3bd4986ef1e83c711e89365bd73dc15e;p=emacs.git

* make-dist (msdos): No more mainmake.
---

diff --git a/ChangeLog b/ChangeLog
index d65a6060a60..6bc657783c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-05-11  Glenn Morris  <rgm@gnu.org>
 
+	* make-dist (msdos): No more mainmake.
+
+	* configure.in: Generate lib-src/Makefile directly, do not run cpp.
+	* config.bat: Do not run cpp on lib-src/Makefile.in.
+
 	* config.bat [HAVE_X11]: Run sed3x.inp on lib-src/Makefile.
 
 2010-05-10  Glenn Morris  <rgm@gnu.org>
diff --git a/make-dist b/make-dist
index 897301e6ce7..f725a1554bd 100755
--- a/make-dist
+++ b/make-dist
@@ -537,7 +537,7 @@ echo "Making links to \`nt/icons'"
 echo "Making links to \`msdos'"
 (cd msdos
  ln ChangeLog INSTALL README emacs.ico emacs.pif ../${tempdir}/msdos
- ln is_exec.c sigaction.c mainmake mainmake.v2 sed*.inp ../${tempdir}/msdos
+ ln is_exec.c sigaction.c mainmake.v2 sed*.inp ../${tempdir}/msdos
  cd ../${tempdir}/msdos
  rm -f =*)