mirror of
https://github.com/correl/melpa.git
synced 2024-11-14 19:19:32 +00:00
Use $EMACS_COMMAND rather than just $EMACS (see #1855)
This commit is contained in:
parent
bff2f4afac
commit
52757abf2e
2 changed files with 7 additions and 7 deletions
12
Makefile
12
Makefile
|
@ -4,7 +4,7 @@ RCPDIR := ./recipes
|
|||
HTMLDIR := ./html
|
||||
WORKDIR := ./working
|
||||
WEBROOT := $$HOME/www
|
||||
EMACS ?= emacs
|
||||
EMACS_COMMAND ?= emacs
|
||||
SLEEP ?= 0
|
||||
SANDBOX := ./sandbox
|
||||
ifdef STABLE
|
||||
|
@ -12,15 +12,15 @@ PKGDIR := ./packages-stable
|
|||
endif
|
||||
STABLE ?= nil
|
||||
|
||||
EVAL := $(EMACS)
|
||||
EVAL := $(EMACS_COMMAND)
|
||||
|
||||
## Check for needing to initialize CL-LIB from ELPA
|
||||
NEED_CL-LIB := $(shell $(EMACS) --no-site-file --batch --eval '(prin1 (version< emacs-version "24.3"))')
|
||||
NEED_CL-LIB := $(shell $(EMACS_COMMAND) --no-site-file --batch --eval '(prin1 (version< emacs-version "24.3"))')
|
||||
ifeq ($(NEED_CL-LIB), t)
|
||||
EMACS := $(EMACS) --eval "(package-initialize)"
|
||||
EMACS_COMMAND := $(EMACS_COMMAND) --eval "(package-initialize)"
|
||||
endif
|
||||
|
||||
EVAL := $(EMACS) --no-site-file --batch -l package-build.el --eval
|
||||
EVAL := $(EMACS_COMMAND) --no-site-file --batch -l package-build.el --eval
|
||||
|
||||
TIMEOUT := $(shell which timeout && echo "-k 60 600")
|
||||
|
||||
|
@ -102,7 +102,7 @@ $(RCPDIR)/%: .FORCE
|
|||
sandbox: packages/archive-contents
|
||||
@echo " • Building sandbox ..."
|
||||
mkdir -p $(SANDBOX)
|
||||
$(EMACS) -Q \
|
||||
$(EMACS_COMMAND) -Q \
|
||||
--eval '(setq user-emacs-directory "$(SANDBOX)")' \
|
||||
-l package \
|
||||
--eval "(add-to-list 'package-archives '(\"gnu\" . \"http://elpa.gnu.org/packages/\") t)" \
|
||||
|
|
|
@ -135,7 +135,7 @@ through this process.
|
|||
make recipes/<NAME>
|
||||
|
||||
(Be sure that the `emacs` on your path is at least version 23, or
|
||||
set `$EMACS` to the location of a suitable binary.)
|
||||
set `$EMACS_COMMAND` to the location of a suitable binary.)
|
||||
|
||||
Alternatively, open the recipe in Emacs and press `C-c C-c` in the
|
||||
recipe buffer: this will also prompt you to install the
|
||||
|
|
Loading…
Reference in a new issue