diff options
| author | Eli Zaretskii | 2013-12-11 19:05:28 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-12-11 19:05:28 +0200 |
| commit | 3ef8e0d150e8a9c820323851bb2ad4d53170a9e8 (patch) | |
| tree | 7078908bd9145ff6b4c6314d4e1e10160aa6195d | |
| parent | 89793882a751915fe186ede73b6315f5edb5551e (diff) | |
| download | emacs-3ef8e0d150e8a9c820323851bb2ad4d53170a9e8.tar.gz emacs-3ef8e0d150e8a9c820323851bb2ad4d53170a9e8.zip | |
More fixes for bug #16099.
lisp/Makefile.in (custom-deps, finder-data): Run output file names
through unmsys--file-name.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/Makefile.in | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 22ff12fe6b4..85776c07a74 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-12-11 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (custom-deps, finder-data): Run output file names | ||
| 4 | through unmsys--file-name. (Bug#16099) | ||
| 5 | |||
| 1 | 2013-12-11 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2013-12-11 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * emacs-lisp/smie.el (smie-indent--hanging-p): Don't bother matching | 8 | * emacs-lisp/smie.el (smie-indent--hanging-p): Don't bother matching |
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 3675cd90e46..0cc22839f99 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in | |||
| @@ -158,7 +158,7 @@ custom-deps: doit | |||
| 158 | $(setwins_almost); \ | 158 | $(setwins_almost); \ |
| 159 | echo Directories: $$wins; \ | 159 | echo Directories: $$wins; \ |
| 160 | $(emacs) -l cus-dep \ | 160 | $(emacs) -l cus-dep \ |
| 161 | --eval '(setq generated-custom-dependencies-file "$(srcdir)/cus-load.el")' \ | 161 | --eval '(setq generated-custom-dependencies-file (unmsys--file-name "$(srcdir)/cus-load.el"))' \ |
| 162 | -f custom-make-dependencies $$wins | 162 | -f custom-make-dependencies $$wins |
| 163 | 163 | ||
| 164 | $(lisp)/finder-inf.el: | 164 | $(lisp)/finder-inf.el: |
| @@ -167,7 +167,7 @@ finder-data: doit | |||
| 167 | $(setwins_almost); \ | 167 | $(setwins_almost); \ |
| 168 | echo Directories: $$wins; \ | 168 | echo Directories: $$wins; \ |
| 169 | $(emacs) -l finder \ | 169 | $(emacs) -l finder \ |
| 170 | --eval '(setq generated-finder-keywords-file "$(srcdir)/finder-inf.el")' \ | 170 | --eval '(setq generated-finder-keywords-file (unmsys--file-name "$(srcdir)/finder-inf.el"))' \ |
| 171 | -f finder-compile-keywords-make-dist $$wins | 171 | -f finder-compile-keywords-make-dist $$wins |
| 172 | 172 | ||
| 173 | # The chmod +w is to handle env var CVSREAD=1. | 173 | # The chmod +w is to handle env var CVSREAD=1. |