Merge branch into feature/integrated-elpa

diff --cc packages/admin/package-makefile.el
index b30ae6e62b06749f392ffdcf0e93f6d0f0a149f0,2151b7e2e8433bb7eeede32973211b211449f1f5..2e6c861b585800d7bd603eb842ed2e276fd80d59
--- 1/packages/admin/package-makefile.el
--- 2/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"