From: Phillip Lord Date: Fri, 16 Sep 2016 09:04:18 +0000 (+0100) Subject: Merge branch into feature/integrated-elpa X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=db2bcc6723a18a0655acf746816c965b8dbadce3;p=emacs.git Merge branch into feature/integrated-elpa --- db2bcc6723a18a0655acf746816c965b8dbadce3 diff --cc packages/admin/package-makefile.el index b30ae6e62b0,2151b7e2e84..2e6c861b585 --- a/packages/admin/package-makefile.el +++ b/packages/admin/package-makefile.el @@@ -1,7 -1,9 +1,10 @@@ (require 'seq) (defvar package-makefile--elpa - (expand-file-name "../../../../elpa-git/master/packages")) + (when (getenv "ELPA") + (concat (getenv "ELPA") + "/packages"))) ++ (defvar package-makefile--log-targets nil) (defvar package-makefile--pkg-targets nil) @@@ -122,18 -124,17 +125,19 @@@ "\n" (when package-makefile--elpa - (package-makefile--pkg-targets - package-makefile--elpa - (package-makefile--elpa-dirs - package-makefile--elpa)) - "\n" - - (package-makefile--test-targets - package-makefile--elpa - (package-makefile--elpa-dirs - package-makefile--elpa))) + (concat + (package-makefile--pkg-targets + package-makefile--elpa + (package-makefile--elpa-dirs + package-makefile--elpa)) + "\n" + + (package-makefile--test-targets + package-makefile--elpa + (package-makefile--elpa-dirs + package-makefile--elpa)))) + + "ert-summarize: " (mapconcat 'identity package-makefile--log-targets " ") "\n\t$(EMACS) --batch -l ert -f ert-summarize-tests-batch-and-exit $^\n\n"