From: Phillip Lord <phillip.lord@russet.org.uk>
Date: Mon, 12 Sep 2016 09:01:05 +0000 (+0100)
Subject: Merge branch 'feature/integrated-elpa' of vm-npl25.ncl.ac.uk:git/emacs into feature... 
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b99bbf52a3e3563e3ea625a2095374331203e60f;p=emacs.git

Merge branch 'feature/integrated-elpa' of vm-npl25.ncl.ac.uk:git/emacs into feature/integrated-elpa
---

b99bbf52a3e3563e3ea625a2095374331203e60f
diff --cc packages/GNUmakefile
index 73303cb59d0,ed686d821be..a6904d7741d
--- a/packages/GNUmakefile
+++ b/packages/GNUmakefile
@@@ -6,9 -6,9 +6,10 @@@ EMACS=../src/emac
  
  DIRS=$(filter-out .,$(subst ./,,$(shell find . -maxdepth 1 -type d)))
  
 -## alas "all" is an ELPA package
 +## alas "all" is an ELPA package, so this is going to break
- all: $(DIRS)
+ build-all: $(DIRS)
+ 
 +
  define package_template
  $(1): $(1)/$(1)-pkg.el