branch: elpa/php-mode
commit 954afdcff5923b85d10ddd34dd89d8d5f9e3be88
Merge: 6b24392a51 52f2f2d392
Author: USAMI Kenta <tad...@pixiv.com>
Commit: GitHub <nore...@github.com>
Merge pull request #705 from emacs-php/fix/makefile-package
Fix Makefile for avoid dependencies on user-installed packages
---
Makefile | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 2bad67e05a..42fcf641e5 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ AUTOLOADS = php-mode-autoloads.el
ELCS = $(ELS:.el=.elc)
%.elc: %.el
- $(EMACS) -Q -batch -L lisp/ -f batch-byte-compile $<
+ $(EMACS) --batch -L lisp/ -f batch-byte-compile $<
all: autoloads $(ELCS) authors
@@ -25,8 +25,8 @@ AUTHORS.md: etc/git/AUTHORS.md.in .mailmap
autoloads: $(AUTOLOADS)
$(AUTOLOADS): lisp/php.el lisp/php-align.el lisp/php-face.el
lisp/php-project.el lisp/php-local-manual.el lisp/php-mode-debug.el
lisp/php-mode.el
- $(EMACS) -Q -batch -L lisp/ --eval \
- "(progn \
+ $(EMACS) --batch -L lisp/ --eval \
+ "(let ((user-emacs-directory default-directory)) \
(require 'package) \
(package-generate-autoloads \"php-mode\" (expand-file-name
\"lisp\")))"
@@ -55,11 +55,9 @@ dev:
# command.
test: clean all
touch tests/project/1/.git
- $(EMACS) -Q -batch -L lisp/ --eval \
+ $(EMACS) --batch -l lisp/php-mode-autoloads.el --eval \
"(let ((default-directory (expand-file-name \".cask\"
default-directory))) \
- (require 'package) \
(normal-top-level-add-subdirs-to-load-path))" \
- -f package-initialize \
-l tests/php-mode-test.el -f ert-run-tests-batch-and-exit
.PHONY: all authors autoloads clean test
