aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog6
-rw-r--r--admin/unidata/makefile.w32-in6
2 files changed, 11 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 705eaff805..d43c23bbea 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-09 Eli Zaretskii <[email protected]>
+
+ * unidata/makefile.w32-in (lisp): New variable.
+ (EMACSLOADPATH): Use $(lisp). Add lisp/international and
+ lisp/emacs-lisp.
+
2008-02-04 Jason Rumney <[email protected]>
* unidata/makefile.w32-in (unidata.txt): Use ARGQUOTE and DQUOTE macros.
diff --git a/admin/unidata/makefile.w32-in b/admin/unidata/makefile.w32-in
index 4a7ba1acb7..bf422f9e46 100644
--- a/admin/unidata/makefile.w32-in
+++ b/admin/unidata/makefile.w32-in
@@ -22,7 +22,11 @@
EMACS = ../../src/$(BLD)/emacs.exe
DSTDIR = ../../lisp/international
-EMACSLOADPATH = $(CURDIR)/../../lisp
+lisp = $(CURDIR)/../../lisp
+# EMACSLOADPATH should include international, so Emacs finds encoded-kb.
+# It should include emacs-lisp, so Emacs finds bytecomp. This is because
+# lisp/subdirs.el is not generated yet when the commands below run.
+EMACSLOADPATH = $(lisp);$(lisp)/international;$(lisp)/emacs-lisp
# Quote EMACS so it could be a file name with embedded whitespace
RUNEMACS = "$(EMACS)" -Q --multibyte -batch