diff options
| author | Glenn Morris | 2013-10-30 16:27:35 -0400 |
|---|---|---|
| committer | Glenn Morris | 2013-10-30 16:27:35 -0400 |
| commit | ca7dd4cd1761362289e877e8c20b412821f669c0 (patch) | |
| tree | 0acf351242550262f794783d56e8a43ae7303d38 /lisp/Makefile.in | |
| parent | 4f85b47922a2e316ccd05be6be85842b2b5c03e3 (diff) | |
| download | emacs-ca7dd4cd1761362289e877e8c20b412821f669c0.tar.gz emacs-ca7dd4cd1761362289e877e8c20b412821f669c0.zip | |
* lisp/Makefile.in (autoloads): Do not use abs_lisp.
This should stop recent weirdness, eg:
http://lists.gnu.org/archive/html/emacs-diffs/2013-10/msg00381.html
* lisp/emacs-lisp/autoload.el: Comment.
Diffstat (limited to 'lisp/Makefile.in')
| -rw-r--r-- | lisp/Makefile.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index ffd31efa1d7..ff9439d8951 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in | |||
| @@ -178,13 +178,15 @@ finder-data: doit | |||
| 178 | $(emacs) -l finder --eval '(setq generated-finder-keywords-file (unmsys--file-name "$(abs_lisp)/finder-inf.el"))' -f finder-compile-keywords-make-dist $$wins | 178 | $(emacs) -l finder --eval '(setq generated-finder-keywords-file (unmsys--file-name "$(abs_lisp)/finder-inf.el"))' -f finder-compile-keywords-make-dist $$wins |
| 179 | 179 | ||
| 180 | # The chmod +w is to handle env var CVSREAD=1. | 180 | # The chmod +w is to handle env var CVSREAD=1. |
| 181 | # Use expand-file-name rather than $abs_lisp so that Emacs does not | ||
| 182 | # get confused when it compares file-names for equality. | ||
| 181 | autoloads: $(LOADDEFS) doit | 183 | autoloads: $(LOADDEFS) doit |
| 182 | cd $(lisp) && chmod +w $(AUTOGEN_VCS) | 184 | cd $(lisp) && chmod +w $(AUTOGEN_VCS) |
| 183 | cd $(lisp) && $(setwins_almost); \ | 185 | cd $(lisp) && $(setwins_almost); \ |
| 184 | echo Directories: $$wins; \ | 186 | echo Directories: $$wins; \ |
| 185 | $(emacs) -l autoload \ | 187 | $(emacs) -l autoload \ |
| 186 | --eval '(setq autoload-builtin-package-versions t)' \ | 188 | --eval '(setq autoload-builtin-package-versions t)' \ |
| 187 | --eval '(setq generated-autoload-file (unmsys--file-name "$(abs_lisp)/loaddefs.el"))' \ | 189 | --eval '(setq generated-autoload-file (expand-file-name (unmsys--file-name "$(lisp)/loaddefs.el")))' \ |
| 188 | -f batch-update-autoloads $$wins | 190 | -f batch-update-autoloads $$wins |
| 189 | 191 | ||
| 190 | # This is required by the bootstrap-emacs target in ../src/Makefile, so | 192 | # This is required by the bootstrap-emacs target in ../src/Makefile, so |