summaryrefslogtreecommitdiff
path: root/default.mk
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2025-11-30 19:44:39 +0100
committerJonas Bernoulli <jonas@bernoul.li>2025-11-30 19:44:39 +0100
commita91418a93c4ae450e8afaa669e29aa3c57518cb2 (patch)
tree4019cb567dac0ade13fe764d5f55165e885fd2da /default.mk
parentd272c3a773a664f33cd61341194d186b1158b4b1 (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.mk18
1 files changed, 9 insertions, 9 deletions
diff --git a/default.mk b/default.mk
index e5be73c..7e88a9f 100644
--- a/default.mk
+++ b/default.mk
@@ -11,18 +11,18 @@ DEPS = compat
DEPS += cond-let
DEPS += seq
+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 ?=
-
-LOAD_PATH ?= $(addprefix -L ../../,$(DEPS))
-LOAD_PATH += -L $(TOP)lisp
-
-ifndef ORG_LOAD_PATH
-ORG_LOAD_PATH = -L ../../org/lisp
-endif
+EMACS ?= emacs
+EMACS_ARGS ?=
+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