From bfe28f06e625b22160410bedf41157e7bbb4c219 Mon Sep 17 00:00:00 2001 From: Phillip Lord Date: Fri, 16 Sep 2016 21:33:04 +0100 Subject: [PATCH] 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 09f1149212a..10e837aa17e 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 -- 2.39.5