diff options
| author | Glenn Morris | 2008-02-14 03:57:12 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-02-14 03:57:12 +0000 |
| commit | b2928357743da1d7cfeca300d64e29c15b84683f (patch) | |
| tree | 1d1e53836f5b6b85c1c5a9c38a51358a4a9260db | |
| parent | b7dece104c051d8dbe57daf0f76fb48f4c773c35 (diff) | |
| download | emacs-b2928357743da1d7cfeca300d64e29c15b84683f.tar.gz emacs-b2928357743da1d7cfeca300d64e29c15b84683f.zip | |
(custom-deps, finder-data, autoloads, recompile):
Remove `LC_ALL=C', since it's included in $(emacs) now.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/Makefile.in | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6c300a39f92..8b021691397 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-02-14 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (custom-deps, finder-data, autoloads, recompile): | ||
| 4 | Remove `LC_ALL=C', since it's included in $(emacs) now. | ||
| 5 | |||
| 1 | 2008-02-14 Zhang Wei <id.brep@gmail.com> (tiny change) | 6 | 2008-02-14 Zhang Wei <id.brep@gmail.com> (tiny change) |
| 2 | 7 | ||
| 3 | * textmodes/org-publish.el (org-publish-timestamp-filename): | 8 | * textmodes/org-publish.el (org-publish-timestamp-filename): |
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 31447ddd67c..df09a51c7cc 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in | |||
| @@ -100,12 +100,12 @@ $(lisp)/cus-load.el: | |||
| 100 | custom-deps: $(lisp)/subdirs.el autoloads $(lisp)/cus-load.el doit | 100 | custom-deps: $(lisp)/subdirs.el autoloads $(lisp)/cus-load.el doit |
| 101 | wd=$(lisp); $(setwins_almost); \ | 101 | wd=$(lisp); $(setwins_almost); \ |
| 102 | echo Directories: $$wins; \ | 102 | echo Directories: $$wins; \ |
| 103 | LC_ALL=C $(emacs) -l cus-dep --eval '(setq generated-custom-dependencies-file "$(lisp)/cus-load.el")' -f custom-make-dependencies $$wins | 103 | $(emacs) -l cus-dep --eval '(setq generated-custom-dependencies-file "$(lisp)/cus-load.el")' -f custom-make-dependencies $$wins |
| 104 | 104 | ||
| 105 | finder-data: $(lisp)/subdirs.el autoloads doit | 105 | finder-data: $(lisp)/subdirs.el autoloads doit |
| 106 | wd=$(lisp); $(setwins_almost); \ | 106 | wd=$(lisp); $(setwins_almost); \ |
| 107 | echo Directories: $$wins; \ | 107 | echo Directories: $$wins; \ |
| 108 | LC_ALL=C $(emacs) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins | 108 | $(emacs) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins |
| 109 | 109 | ||
| 110 | $(lisp)/loaddefs.el: | 110 | $(lisp)/loaddefs.el: |
| 111 | echo ";;; loaddefs.el --- automatically extracted autoloads" >> $@ | 111 | echo ";;; loaddefs.el --- automatically extracted autoloads" >> $@ |
| @@ -120,7 +120,7 @@ $(lisp)/loaddefs.el: | |||
| 120 | autoloads: $(lisp)/subdirs.el $(lisp)/loaddefs.el doit | 120 | autoloads: $(lisp)/subdirs.el $(lisp)/loaddefs.el doit |
| 121 | wd=$(lisp); $(setwins_almost); \ | 121 | wd=$(lisp); $(setwins_almost); \ |
| 122 | echo Directories: $$wins; \ | 122 | echo Directories: $$wins; \ |
| 123 | LC_ALL=C $(emacs) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins | 123 | $(emacs) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins |
| 124 | 124 | ||
| 125 | $(lisp)/subdirs.el: | 125 | $(lisp)/subdirs.el: |
| 126 | $(MAKE) $(MFLAGS) update-subdirs | 126 | $(MAKE) $(MFLAGS) update-subdirs |
| @@ -220,7 +220,7 @@ compile-after-backup: backup-compiled-files compile-always | |||
| 220 | # new ones. | 220 | # new ones. |
| 221 | 221 | ||
| 222 | recompile: doit mh-autoloads $(lisp)/progmodes/cc-mode.elc | 222 | recompile: doit mh-autoloads $(lisp)/progmodes/cc-mode.elc |
| 223 | LC_ALL=C $(emacs) --eval "(batch-byte-recompile-directory 0)" $(lisp) | 223 | $(emacs) --eval "(batch-byte-recompile-directory 0)" $(lisp) |
| 224 | 224 | ||
| 225 | # CC Mode uses a compile time macro system which causes a compile time | 225 | # CC Mode uses a compile time macro system which causes a compile time |
| 226 | # dependency in cc-mode.elc on the macros in cc-langs.el and the | 226 | # dependency in cc-mode.elc on the macros in cc-langs.el and the |