summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-10-02 09:30:24 (GMT)
committer Bastien Guerry <bzg@altern.org>2012-10-02 09:30:24 (GMT)
commit5dcca7201171d7e874c520d6a0b96a4418a52d2c (patch)
treeefb3131508fd40502ffa406641ef2efb6f961a89
parent5fc07bce0ada642ea4f46922f79823bfbf9a2466 (diff)
downloadorg-mode-5dcca7201171d7e874c520d6a0b96a4418a52d2c.zip
org-mode-5dcca7201171d7e874c520d6a0b96a4418a52d2c.tar.gz
Use org-loaddefs.el instead of org-install.el.
-rw-r--r--mk/default.mk6
-rw-r--r--mk/org-fixup.el10
2 files changed, 8 insertions, 8 deletions
diff --git a/mk/default.mk b/mk/default.mk
index 3e1c550..dcd2947 100644
--- a/mk/default.mk
+++ b/mk/default.mk
@@ -56,7 +56,7 @@ BTEST = $(BATCH) \
--eval '(add-to-list '"'"'load-path "./lisp")' \
--eval '(add-to-list '"'"'load-path "./testing")' \
$(BTEST_POST) \
- -l org-install.el \
+ -l org-loaddefs.el \
-l testing/org-test.el \
$(foreach ob-lang,$(BTEST_OB_LANGUAGES),$(req-ob-lang)) \
$(foreach req,$(BTEST_EXTRA),$(req-extra)) \
@@ -81,11 +81,11 @@ MAKE_LOCAL_MK = $(BATCHO) \
BATCHL = $(BATCH) \
--eval '(add-to-list '"'"'load-path ".")'
-# How to generate org-install.el
+# How to generate org-loaddefs.el
MAKE_ORG_INSTALL = $(BATCHL) \
--eval '(load "org-compat.el")' \
--eval '(load "../mk/org-fixup.el")' \
- --eval '(org-make-org-install)'
+ --eval '(org-make-org-loaddefs)'
# How to generate org-version.el
MAKE_ORG_VERSION = $(BATCHL) \
diff --git a/mk/org-fixup.el b/mk/org-fixup.el
index 890e2b7..7b59efb 100644
--- a/mk/org-fixup.el
+++ b/mk/org-fixup.el
@@ -61,8 +61,8 @@ the Git work tree)."
(toggle-read-only 0)
(write-file "org-version.el")))
-(defun org-make-org-install ()
- "Make the file org-install.el in the current directory.
+(defun org-make-org-loaddefs ()
+ "Make the file org-loaddefs.el in the current directory.
This function is internally used by the build system and should
be used by foreign build systems or installers to produce this
file in the installation directory of org-mode. Org will not
@@ -75,12 +75,12 @@ work correctly if this file is not up-to-date."
(insert "\f\n(provide 'org-loaddefs)\n")
(insert "\f\n;; Local Variables:\n;; version-control: never\n")
(insert ";; no-byte-compile: t\n;; no-update-autoloads: t\n")
- (insert ";; coding: utf-8\n;; End:\n;;; org-install.el ends here\n")
+ (insert ";; coding: utf-8\n;; End:\n;;; org-loaddefs.el ends here\n")
(toggle-read-only 0)
(save-buffer)))
(defun org-make-autoloads (&optional compile force)
- "Make the files org-install and org-version.el in the install directory.
+ "Make the files org-loaddefs.el and org-version.el in the install directory.
Finds the install directory by looking for library \"org\".
Optionally byte-compile lisp files in the install directory or
force re-compilation. This function is provided for easier
@@ -96,7 +96,7 @@ manual install when the build system can't be used."
(cd dirlisp)
(org-fixup)
(org-make-org-version (org-release) (org-git-version) dirodt)
- (org-make-org-install)
+ (org-make-org-loaddefs)
(when compile (byte-recompile-directory dirlisp 0 force)))
(cd origin))))