[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/integrated-elpa cf1d196 21/23: ELPA as an environm
From: |
Phillip Lord |
Subject: |
[Emacs-diffs] feature/integrated-elpa cf1d196 21/23: ELPA as an environment variable |
Date: |
Fri, 16 Sep 2016 20:34:17 +0000 (UTC) |
branch: feature/integrated-elpa
commit cf1d19644d34e0ba68050353f7e489fc28cfedad
Author: Phillip Lord <address@hidden>
Commit: Phillip Lord <address@hidden>
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 2e75097..65dbf7e 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 528bb8d..09f1149 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 5c600c4..2151b7e 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"
- [Emacs-diffs] branch feature/integrated-elpa created (now bfe28f0), Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa b99bbf5 04/23: Merge branch 'feature/integrated-elpa' of vm-npl25.ncl.ac.uk:git/emacs into feature/integrated-elpa, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa fb9a7bf 07/23: Example test, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 0b70bfc 08/23: Build and test ELPA packages also, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 679fde7 17/23: Fix include in makefile, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 48e846d 12/23: Build system now in generated makefile, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 6b13eac 03/23: Initial Support for ELPA packages in core, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa cf1d196 21/23: ELPA as an environment variable,
Phillip Lord <=
- [Emacs-diffs] feature/integrated-elpa 73afa20 02/23: Starting to add test support, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 031233d 05/23: build-all depends on emacs, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 937c695 18/23: Add bug report about multifile packages, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 4b0cf9d 06/23: Various path hacks, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 4f6df43 15/23: README added, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 5a2fa7a 11/23: Lots of changes, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa d208ef5 13/23: Makefile generator for tests, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 2456488 09/23: Start to factor out, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 5d0232b 19/23: Multifile packages now work, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa b2f34a4 20/23: ELPA support, Phillip Lord, 2016/09/16