[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/integrated-elpa bfe28f0 23/23: Better handling of
From: |
Phillip Lord |
Subject: |
[Emacs-diffs] feature/integrated-elpa bfe28f0 23/23: Better handling of ELPA env var |
Date: |
Fri, 16 Sep 2016 20:34:17 +0000 (UTC) |
branch: feature/integrated-elpa
commit bfe28f06e625b22160410bedf41157e7bbb4c219
Author: Phillip Lord <address@hidden>
Commit: Phillip Lord <address@hidden>
Better handling of ELPA env var
---
packages/Makefile.in | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/packages/Makefile.in b/packages/Makefile.in
index 09f1149..10e837a 100644
--- a/packages/Makefile.in
+++ b/packages/Makefile.in
@@ -6,13 +6,15 @@ EMACS= ../src/emacs
## This should be coming from autoconf!
ELPA=/home/phillord/src/git/elpa-git/master
-
+ifdef ELPA
+ELPA_ENV=ELPA=$(ELPA)
+endif
DIRS=$(filter-out .,$(subst ./,,$(shell find . -maxdepth 1 -type d)))
## dependent on makefile
-all: pkg-all $(EMACS)
+all: pkg-all makefile-inc.mk
check: cleanlog check-packages ert-summarize
@@ -21,7 +23,7 @@ check-maybe: check-packages
WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@
makefile-inc.mk: ./admin/package-makefile.el
- ELPA=$(ELPA) $(EMACS) --batch --load admin/package-makefile.el \
+ $(ELPA_ENV) $(EMACS) --batch --load admin/package-makefile.el \
--funcall package-makefile
include makefile-inc.mk
- [Emacs-diffs] feature/integrated-elpa 4b0cf9d 06/23: Various path hacks, (continued)
- [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
- [Emacs-diffs] feature/integrated-elpa dad684e 10/23: Refactor new files, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 8b53bb8 14/23: Summarization happening and some ELPA support, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa db2bcc6 22/23: Merge branch into feature/integrated-elpa, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa bfe28f0 23/23: Better handling of ELPA env var,
Phillip Lord <=
- [Emacs-diffs] feature/integrated-elpa ac145ce 16/23: autoconf support, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa c1c7c63 01/23: Initial Support for ELPA packages in core, Phillip Lord, 2016/09/16