branch: elpa/popup
commit 80829dd46381754639fb764da11c67235fe63282
Author: Syohei YOSHIDA <syo...@gmail.com>
Commit: Syohei YOSHIDA <syo...@gmail.com>
Fix for newer Cask directory hierarchy
---
Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 6c7c3bc..d26c0ef 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,7 @@ EMACS ?= emacs
CASK ?= cask
EMACS23=emacs23
-ELPA_DIR = \
- .cask/$(shell $(EMACS) -Q --batch --eval '(princ emacs-version)')/elpa
+ELPA_DIR = $(shell EMACS=$(EMACS) $(CASK) package-directory)
.PHONY: test test-nw test-emacs23 test-emacs23-nw travis-ci
