summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xmake-dist2
2 files changed, 6 insertions, 1 deletions
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 =*)