summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-10-02 15:38:56 (GMT)
committer Bastien Guerry <bzg@altern.org>2012-10-02 15:38:56 (GMT)
commit30235e67733cd3cc4621916ca9231ad96ca85c10 (patch)
tree14dd312cb25845bb5eb7a2502c0faba11e291d0d
parent154c4c87621e25c58ab99a45c8056e43898c084f (diff)
parent5f9177ad3a5a8f12fbbca8d0b666de9eb8c3e73a (diff)
downloadorg-mode-30235e67733cd3cc4621916ca9231ad96ca85c10.zip
org-mode-30235e67733cd3cc4621916ca9231ad96ca85c10.tar.gz
Merge branch 'maint'
-rw-r--r--mk/default.mk5
-rw-r--r--mk/org-fixup.el10
2 files changed, 8 insertions, 7 deletions
diff --git a/mk/default.mk b/mk/default.mk
index dcd2947..94ef825 100644
--- a/mk/default.mk
+++ b/mk/default.mk
@@ -13,9 +13,6 @@ 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
@@ -91,7 +88,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)" "$(datadir)")'
+ --eval '(org-make-org-version "$(ORGVERSION)" "$(GITVERSION)")'
# How to byte-compile the whole source directory
ELCDIR = $(BATCHL) \
diff --git a/mk/org-fixup.el b/mk/org-fixup.el
index 5754274..2e2d48a 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 odt-dir)
+(defun org-make-org-version (org-release org-git-version)
"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,7 +50,11 @@ 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))")
+ 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")
(toggle-read-only 0)
(write-file "org-version.el")))
@@ -85,7 +89,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) dirodt)
+ (org-make-org-version (org-release) (org-git-version))
(org-make-org-loaddefs)
(when compile (byte-recompile-directory dirlisp 0 force)))
(cd origin))))