diff options
| author | Eli Zaretskii | 2013-12-10 22:56:59 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-12-10 22:56:59 +0200 |
| commit | ceac12b73183b3f90804373d5ac5c45c0165e4f9 (patch) | |
| tree | 11d76a7ff8a6253bf62a5153fff2ffd5ef70bd35 | |
| parent | e8374b3959e3fc809b7834e3b85245928ae83774 (diff) | |
| download | emacs-ceac12b73183b3f90804373d5ac5c45c0165e4f9.tar.gz emacs-ceac12b73183b3f90804373d5ac5c45c0165e4f9.zip | |
Fix bug #16099 with failed out-of-tree builds on MS-Windows.
lisp/Makefile.in (autoloads): Run $(srcdir)/loaddefs.el through
unmsys--file-name.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/Makefile.in | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f61812f7e1a..59ffe0ea5c4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-12-10 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (autoloads): Run $(srcdir)/loaddefs.el through | ||
| 4 | unmsys--file-name. (Bug#16099) | ||
| 5 | |||
| 1 | 2013-12-10 Teodor Zlatanov <tzz@lifelogs.com> | 6 | 2013-12-10 Teodor Zlatanov <tzz@lifelogs.com> |
| 2 | 7 | ||
| 3 | * emacs-lisp/package.el (package-keyword-button-action): Remove | 8 | * emacs-lisp/package.el (package-keyword-button-action): Remove |
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 9c9eacfd386..3675cd90e46 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in | |||
| @@ -183,7 +183,7 @@ autoloads: $(LOADDEFS) doit | |||
| 183 | echo Directories: $$wins; \ | 183 | echo Directories: $$wins; \ |
| 184 | $(emacs) -l autoload \ | 184 | $(emacs) -l autoload \ |
| 185 | --eval '(setq autoload-builtin-package-versions t)' \ | 185 | --eval '(setq autoload-builtin-package-versions t)' \ |
| 186 | --eval '(setq generated-autoload-file (expand-file-name "$(srcdir)/loaddefs.el"))' \ | 186 | --eval '(setq generated-autoload-file (expand-file-name (unmsys--file-name "$(srcdir)/loaddefs.el")))' \ |
| 187 | -f batch-update-autoloads $$wins | 187 | -f batch-update-autoloads $$wins |
| 188 | 188 | ||
| 189 | # This is required by the bootstrap-emacs target in ../src/Makefile, so | 189 | # This is required by the bootstrap-emacs target in ../src/Makefile, so |