forked from mirrors/org-mode
Merge branch 'maint'
This commit is contained in:
commit
281595849b
|
@ -71,10 +71,6 @@ BATCH = $(EMACS) -batch -Q
|
|||
BATCHO = $(BATCH) \
|
||||
--eval '(add-to-list '"'"'load-path "./lisp")'
|
||||
|
||||
# How to show Org version
|
||||
SHOWVER = $(BATCHO) \
|
||||
--eval '(org-version nil '"'"'full '"'"'message)'
|
||||
|
||||
# How to generate local.mk
|
||||
MAKE_LOCAL_MK = $(BATCHO) \
|
||||
--eval '(load "org-compat.el")' \
|
||||
|
|
|
@ -67,7 +67,6 @@ config-cmd config-all::
|
|||
config config-test config-exe config-all config-version::
|
||||
$(info ========= Org version)
|
||||
$(info make: Org-mode version $(ORGVERSION) ($(GITVERSION) => $(lispdir)))
|
||||
@echo -n "emacs: " ; $(SHOWVER)
|
||||
@echo ""
|
||||
|
||||
oldorg: compile info # what the old makefile did when no target was specified
|
||||
|
|
Loading…
Reference in a new issue