diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2015-12-25 13:23:17 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2015-12-25 13:23:17 +0200 |
| commit | 94a3606243d3923ac457aeff33f3ce82b65ef6cd (patch) | |
| tree | 22c510879eebd1e466485acac9e33154f59ff408 /src | |
| parent | b2b84b166a7ac454850ab4832ef40a41dce74cf7 (diff) | |
| download | emacs-94a3606243d3923ac457aeff33f3ce82b65ef6cd.tar.gz | |
Fix bootstrap broken by changes related to OS X file-name encoding
* lisp/international/ucs-normalize.el (eval-when-compile): Make
sure char-code-property-alist includes elements that allow access
to 'decomposition' and 'canonical-combining-class' Unicode
properties, as compiling ucs-normalize.el requires that.
* lisp/loadup.el (featurep 'ns): Load ucs-normalize and ns-win
only of charprop.el was already loaded.
* src/Makefile.in ($(lispsource)/international/ucs-normalize.elc):
New order-only dependency.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 4fee1bea883..8357655af3b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -486,6 +486,11 @@ $(srcdir)/macuvs.h $(lispsource)/international/charprop.el: \ bootstrap-emacs$(EXEEXT) FORCE $(MAKE) -C ../admin/unidata all EMACS="../$(bootstrap_exe)" +## We require charprop.el to exist before ucs-normalize.el is +## byte-compiled, because ucs-normalize.el needs to load 2 uni-*.el files. +$(lispsource)/international/ucs-normalize.elc: | \ + $(lispsource)/international/charprop.el + lispintdir = ${lispsource}/international ${lispintdir}/cp51932.el ${lispintdir}/eucjp-ms.el: FORCE ${MAKE} -C ../admin/charsets $(notdir $@) |