diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2025-11-30 19:44:51 +0100 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2025-11-30 19:44:51 +0100 |
| commit | b68e405dd87c12160db20d5fa9527bbdc627a58e (patch) | |
| tree | ada32914318770bee8064afaed6637f21e24bee7 /default.mk | |
| parent | 72e80f1236237f346d9692ab8e793798b8c038c5 (diff) | |
make: Add new EMACS_Q_ARG variable
It defaults to "-Q" but users can instead use "-q", which is useful if
"site-start.el" contains essential settings. Also add `EMACS_BATCH'
and `EMACS_ORG', and rework use of related variables.
Diffstat (limited to 'default.mk')
| -rw-r--r-- | default.mk | 19 |
1 files changed, 9 insertions, 10 deletions
@@ -10,19 +10,18 @@ ELCS = $(ELS:.el=.elc) DEPS = compat DEPS += vterm +LOAD_PATH ?= $(addprefix -L ../../,$(DEPS)) +LOAD_PATH += -L . +ORG_LOAD_PATH ?= -L ../../org/lisp + VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0 | cut -c2-) REVDESC := $(shell test -e $(TOP).git && git describe --tags) -EMACS ?= emacs -EMACS_ARGS ?= -EMACS_ARGS += --eval '(setq with-editor-emacsclient-executable nil)' - -LOAD_PATH ?= $(addprefix -L ../../,$(DEPS)) -LOAD_PATH += -L . - -ifndef ORG_LOAD_PATH -ORG_LOAD_PATH = -L ../../org/lisp -endif +EMACS ?= emacs +EMACS_ARGS ?= --eval "(setq with-editor-emacsclient-executable nil)" +EMACS_Q_ARG ?= -Q +EMACS_BATCH ?= $(EMACS) $(EMACS_Q_ARG) --batch $(EMACS_ARGS) $(LOAD_PATH) +EMACS_ORG ?= $(EMACS) $(EMACS_Q_ARG) --batch $(EMACS_ARGS) $(ORG_LOAD_PATH) INSTALL_INFO ?= $(shell command -v ginstall-info || printf install-info) MAKEINFO ?= makeinfo |