From cf1d19644d34e0ba68050353f7e489fc28cfedad Mon Sep 17 00:00:00 2001
From: Phillip Lord <phillip.lord@russet.org.uk>
Date: Thu, 15 Sep 2016 23:25:39 +0100
Subject: [PATCH] ELPA as an environment variable

---
 configure.ac                       | 5 +++++
 packages/Makefile.in               | 8 ++++++--
 packages/admin/package-makefile.el | 9 ++++++---
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2e750970d69..65dbf7e550e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3755,6 +3755,10 @@ fi
 AC_SUBST(LIBXML2_LIBS)
 AC_SUBST(LIBXML2_CFLAGS)
 
+
+ELPA=""
+AC_SUBST(ELPA)
+
 # Check for mail-locking functions in a "mail" library.  Probably this should
 # have the same check as for liblockfile below.
 AC_CHECK_LIB(mail, maillock, have_mail=yes, have_mail=no)
@@ -5392,6 +5396,7 @@ SUBDIR_MAKEFILES_IN=`echo " ${SUBDIR_MAKEFILES}" | sed -e 's| | $(srcdir)/|g' -e
 
 AC_SUBST(SUBDIR_MAKEFILES_IN)
 
+
 dnl You might wonder (I did) why epaths.h is generated by running make,
 dnl rather than just letting configure generate it from epaths.in.
 dnl One reason is that the various paths are not fully expanded (see above);
diff --git a/packages/Makefile.in b/packages/Makefile.in
index 528bb8d3a06..09f1149212a 100644
--- a/packages/Makefile.in
+++ b/packages/Makefile.in
@@ -2,7 +2,11 @@
 
 
 EMACS= ../src/emacs
-ELPA=../../elpa
+
+
+## This should be coming from autoconf!
+ELPA=/home/phillord/src/git/elpa-git/master
+
 
 
 DIRS=$(filter-out .,$(subst ./,,$(shell find . -maxdepth 1 -type d)))
@@ -17,7 +21,7 @@ check-maybe: check-packages
 WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@
 
 makefile-inc.mk: ./admin/package-makefile.el
-	$(EMACS) --batch --load admin/package-makefile.el \
+	ELPA=$(ELPA)   $(EMACS) --batch --load admin/package-makefile.el \
 		--funcall package-makefile
 
 include makefile-inc.mk
diff --git a/packages/admin/package-makefile.el b/packages/admin/package-makefile.el
index 5c600c459f4..2151b7e2e84 100644
--- a/packages/admin/package-makefile.el
+++ b/packages/admin/package-makefile.el
@@ -1,6 +1,9 @@
 (require 'seq)
 
-(defvar package-makefile--elpa nil)
+(defvar package-makefile--elpa
+  (when (getenv "ELPA")
+    (concat (getenv "ELPA")
+            "/packages")))
 (defvar package-makefile--log-targets nil)
 (defvar package-makefile--pkg-targets nil)
 
@@ -124,7 +127,7 @@
        (package-makefile--pkg-targets
         package-makefile--elpa
         (package-makefile--elpa-dirs
-         package-makefile-0elpa))
+         package-makefile--elpa))
        "\n"
 
        (package-makefile--test-targets
@@ -133,7 +136,7 @@
          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