diff options
| author | Sébastien Delafond <sdelafond@gmail.com> | 2014-07-13 13:35:27 +0200 |
|---|---|---|
| committer | Sébastien Delafond <sdelafond@gmail.com> | 2014-07-13 13:35:27 +0200 |
| commit | e32a45ed36d6000db4b39171149072d11b77af72 (patch) | |
| tree | b5f4a7d43022c08c3298e82b3e9fc50f68be660f /mk/default.mk | |
| parent | 7697fa4daf3ec84f85711a84035d8f0224afd4e3 (diff) | |
Imported Upstream version 8.0.7
Diffstat (limited to 'mk/default.mk')
| -rw-r--r-- | mk/default.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mk/default.mk b/mk/default.mk index 3e1c550..1bafecb 100644 --- a/mk/default.mk +++ b/mk/default.mk @@ -24,7 +24,7 @@ infodir = $(prefix)/info # Define if you want to include some (or all) files from contrib/lisp # just the filename please (no path prefix, no .el suffix), maybe with globbing -#ORG_ADD_CONTRIB = org-e-* org-md org-export # e.g. the new exporter +#ORG_ADD_CONTRIB = ox-* # e.g. the contributed exporter # Where to create temporary files for the testsuite # respect TMPDIR if it is already defined in the environment @@ -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)) \ @@ -65,7 +65,8 @@ BTEST = $(BATCH) \ # Using emacs in batch mode. # BATCH = $(EMACS) -batch -vanilla # XEmacs -BATCH = $(EMACS) -batch -Q +BATCH = $(EMACS) -batch -Q \ + --eval '(setq vc-handled-backends nil)' # Emacs must be started in toplevel directory BATCHO = $(BATCH) \ @@ -81,17 +82,17 @@ 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) \ --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)" "'$(datadir)'")' # How to byte-compile the whole source directory ELCDIR = $(BATCHL) \ |