From: Gerd Moellmann <gerd@gnu.org>
Date: Tue, 26 Sep 2000 19:24:22 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~1360
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ce75c97aa84196fc999e16382c6cfae5b81e7f90;p=emacs.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 824dd934c5d..d96bf143e04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-09-26  Gerd Moellmann  <gerd@gnu.org>
+
+	* make-dist: Adapt to the change of leim/Makefile which was
+	necessary to ensure a reasonably working `make dist'.
+
+	* leim-Makefile.in: Moved to leim/Makefile.in..
+
+	* noleim-Makefile.in: New file, formerly leim/Makefile.in.
+
 2000-09-21  Kenichi Handa  <handa@etl.go.jp>
 
 	* leim-Makefile.in (TIT-GB, TIT-BIG5, NON-TIT-GB, NON-TIT-BIG5) 
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 428ab4ece9b..79a628bf45c 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-26  Gerd Moellmann  <gerd@gnu.org>
+
+	* Makefile.in: Make this the leim Makefile.in.
+	(clean): Also remove $NON-TIT and $WORLD.
+	(RUN-EMACS): Set EMACSLOADPATH.
+
 2000-09-21  Kenichi Handa  <handa@etl.go.jp>
 
 	* Makefile.in: Revert to no-leim Makefile.
diff --git a/noleim-Makefile.in b/noleim-Makefile.in
new file mode 100644
index 00000000000..776a1ecb642
--- /dev/null
+++ b/noleim-Makefile.in
@@ -0,0 +1,7 @@
+# This placeholder appears in the `leim' subdirectory in the Emacs
+# distribution.  It is is overwritten with a real makefile
+# when you actually extract LEIM into the directory.
+all install:
+
+# Avoid error when these targets are used.
+clean distclean mostlyclean maintainer-clean: