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

diff --cc packages/GNUmakefile
index 73303cb59d0f00d8815855d88c9acb38fd6a3703,ed686d821bebfcf562c98ce509ea21df987cac24..a6904d7741d6484875470807e84d0ce1d16fd5bb
--- 1/packages/GNUmakefile
--- 2/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