summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhillip Lord <phillip.lord@russet.org.uk>2019-01-26 10:28:56 +0000
committerPhillip Lord <phillip.lord@russet.org.uk>2019-01-26 10:28:56 +0000
commit05e20b88c4f8b2b82f22d7c36c408c272b6f16c5 (patch)
tree8fd93c025d5a9e1d3e017f7ab4735bc902470da8
parentbf7519e84dcefa5383f2cd90b8024108fa6cba94 (diff)
downloademacs-feature/core-elpa-by-copy.tar.gz
Fix dependency between packages and ELPA checkoutfeature/core-elpa-by-copy
-rw-r--r--elpa/Makefile.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/elpa/Makefile.in b/elpa/Makefile.in
index 1ec852c7e1f..ad79fcbbb67 100644
--- a/elpa/Makefile.in
+++ b/elpa/Makefile.in
@@ -10,7 +10,7 @@ endif
dirstate = .git/logs/HEAD
VCSWITNESS = $(if $(wildcard $(srcdir)/$(dirstate)),$$(srcdir)/../$(dirstate))
-all: $(ELPA_PATH)/FETCH_HEAD all-packages
+all: all-packages
../lisp/elpa:
mkdir ../lisp/elpa
@@ -29,14 +29,14 @@ $(ELPA_PATH)/FETCH_HEAD: $(ELPA_PATH) Makefile
PACKAGES=
define package_template
- packages/$(1)-$(2)/$(1):
+ packages/$(1)-$(2)/$(1): $(ELPA_PATH)/FETCH_HEAD
./bin/extract-package.sh -g $(ELPA_PATH) -p $(1) -s $(2) $(3)
+ $$(MAKE) -C packages/$(1)-$(2)/$(1) -f package-makefile.mk deploy PACKAGE=$(1)
$(1): packages/$(1)-$(2)/$(1)
- $$(MAKE) -C packages/$(1)-$(2)/$(1) -f package-makefile.mk deploy PACKAGE=$(1)
.PHONY: $(1)
- PACKAGES:=$$(PACKAGES) $(1)
+ PACKAGES:=$$(PACKAGES) packages/$(1)-$(2)/$(1)
endef
$(eval $(call package_template,pabbrev,d28cf8632d2691dc93afbb28500126242d37961c,-e))