branch: elpa-admin
commit a8fb2f99506c4badb3082952e5f4dab9b0dc2e34
Author: Stefan Monnier <[email protected]>
Commit: Stefan Monnier <[email protected]>
GNUmakefile (pkgs): Use `PACKAGE_DIRS` to avoid non-directories
---
GNUmakefile | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index 88486e8b87..ea9c778e89 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -57,7 +57,8 @@ archiv%/index.html: archiv%/archive-contents
-f elpaa-batch-html-make-index $< $*
########## Rules for in-place installation ####################################
-pkgs := $(wildcard packages/*)
+PACKAGE_DIRS := $(shell find packages -mindepth 1 -maxdepth 1 -type d)
+pkgs := $(PACKAGE_DIRS) #$(wildcard packages/*)
define SET-diff
$(shell $(file > .tmp.setdiff, $(1)) \
@@ -127,6 +128,8 @@ packages/%.elc: packages/%.el
--eval "(setq package-directory-list \
(list \"$(abspath other-packages)\") \
load-prefer-newer t \
+ byte-compile-debug t \
+ debug-on-error t \
package-user-dir \"$(abspath packages)\")" \
-f package-activate-all \
-L $(dir $@) -f batch-byte-compile $<
@@ -267,9 +270,7 @@ externals worktrees: # "externals" is the old name
we used to use.
################### Testing ###############
-
-PACKAGE_DIRS = $(shell find packages -maxdepth 1 -type d)
-PACKAGES=$(subst /,,$(subst packages,,$(PACKAGE_DIRS)))
+PACKAGES=$(subst packages/,,$(PACKAGE_DIRS))
define test_template
$(1)-test:
