From b2f34a49862f750d209bbd849b0193534d000477 Mon Sep 17 00:00:00 2001
From: Phillip Lord <phillip.lord@russet.org.uk>
Date: Thu, 15 Sep 2016 15:24:57 +0100
Subject: [PATCH] ELPA support

---
 packages/README.org                |  5 +++--
 packages/admin/package-makefile.el | 26 ++++++++++++++------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/packages/README.org b/packages/README.org
index 9c5fa7b3c28..17a7cc9aafd 100644
--- a/packages/README.org
+++ b/packages/README.org
@@ -42,8 +42,9 @@ necessary for this cannot be here.
 
 Packages now build, test and summarise correctly.
 
-Preliminary ELPA support has been added also, but is correctly
-disabled. Most of these do not have regular test file locations at the moment.
+Preliminary ELPA support has been added also, but is currently
+hardcoded. Most of these do not have regular test file locations at
+the moment.
 
 * Things to do
 
diff --git a/packages/admin/package-makefile.el b/packages/admin/package-makefile.el
index 5c600c459f4..b30ae6e62b0 100644
--- a/packages/admin/package-makefile.el
+++ b/packages/admin/package-makefile.el
@@ -1,6 +1,7 @@
 (require 'seq)
 
-(defvar package-makefile--elpa nil)
+(defvar package-makefile--elpa
+  (expand-file-name "../../../../elpa-git/master/packages"))
 (defvar package-makefile--log-targets nil)
 (defvar package-makefile--pkg-targets nil)
 
@@ -121,19 +122,20 @@
      "\n"
 
      (when package-makefile--elpa
-       (package-makefile--pkg-targets
-        package-makefile--elpa
-        (package-makefile--elpa-dirs
-         package-makefile-0elpa))
-       "\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) -l ert -f ert-summarize-tests-batch-and-exit $^\n\n"
+     "\n\t$(EMACS) --batch -l ert -f ert-summarize-tests-batch-and-exit $^\n\n"
 
      "pkg-all: " (mapconcat 'identity package-makefile--pkg-targets " ")
      "\n\n"
-- 
2.39.5