diff options
author | Bastien Guerry <bzg@altern.org> | 2012-10-03 12:13:33 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-10-03 12:13:33 +0200 |
commit | 5c9006de49b87d90e3b2ffe0f32e2ab479a80be6 (patch) | |
tree | 3c7453735faab3330c10d634d1baa864f02bd258 | |
parent | 1a029166a720b205456b4b5f2763dd8e17359704 (diff) | |
download | org-mode-5c9006de49b87d90e3b2ffe0f32e2ab479a80be6.tar.gz |
Revert "Fix previous commit."
This reverts commit 5f9177ad3a5a8f12fbbca8d0b666de9eb8c3e73a.
-rw-r--r-- | mk/default.mk | 5 | ||||
-rw-r--r-- | mk/org-fixup.el | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/mk/default.mk b/mk/default.mk index 94ef825..dcd2947 100644 --- a/mk/default.mk +++ b/mk/default.mk @@ -13,6 +13,9 @@ prefix = /usr/share # Where local lisp files go. lispdir= $(prefix)/emacs/site-lisp/org +# Where local data files go. +datadir = $(prefix)/emacs/etc/org + # Where info files go. infodir = $(prefix)/info @@ -88,7 +91,7 @@ MAKE_ORG_INSTALL = $(BATCHL) \ MAKE_ORG_VERSION = $(BATCHL) \ --eval '(load "org-compat.el")' \ --eval '(load "../mk/org-fixup.el")' \ - --eval '(org-make-org-version "$(ORGVERSION)" "$(GITVERSION)")' + --eval '(org-make-org-version "$(ORGVERSION)" "$(GITVERSION)" "$(datadir)")' # How to byte-compile the whole source directory ELCDIR = $(BATCHL) \ diff --git a/mk/org-fixup.el b/mk/org-fixup.el index 2e2d48a..5754274 100644 --- a/mk/org-fixup.el +++ b/mk/org-fixup.el @@ -27,7 +27,7 @@ (require 'autoload) (require 'org-compat "org-compat.el") -(defun org-make-org-version (org-release org-git-version) +(defun org-make-org-version (org-release org-git-version odt-dir) "Make the file org-version.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 @@ -50,11 +50,7 @@ the Git work tree)." \"The Git version of org-mode. Inserted by installing org-mode or when a release is made.\" (let ((org-git-version \"" org-git-version "\")) - org-git-version)) -\f\n\(provide 'org-version\) -\f\n;; Local Variables:\n;; version-control: never -;; no-byte-compile: t -;; coding: utf-8\n;; End:\n;;; org-version.el ends here\n") + org-git-version))") (toggle-read-only 0) (write-file "org-version.el"))) @@ -89,7 +85,7 @@ manual install when the build system can't be used." (progn (cd dirlisp) (org-fixup) - (org-make-org-version (org-release) (org-git-version)) + (org-make-org-version (org-release) (org-git-version) dirodt) (org-make-org-loaddefs) (when compile (byte-recompile-directory dirlisp 0 force))) (cd origin)))) |