Browse Source

Revert "Fix previous commit."

This reverts commit 5f9177ad3a5a8f12fbbca8d0b666de9eb8c3e73a.
Bastien Guerry 5 years ago
parent
commit
5c9006de49
2 changed files with 7 additions and 8 deletions
  1. 4 1
      mk/default.mk
  2. 3 7
      mk/org-fixup.el

+ 4 - 1
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) \

+ 3 - 7
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))))