branch: master
commit c09eca2536cf0ccdbc202a17b2027bff7b8f788f
Author: Jackson Ray Hamilton <jack...@jacksonrayhamilton.com>
Commit: Jackson Ray Hamilton <jack...@jacksonrayhamilton.com>
Change to package directory before checking .elpaignore exclusions.
If we don't do this, the package's directory's name is included in the file
names that are checked for .elpaignore matches. .elpaignore matches should
be
assumed to occur inside the package's directory.
---
GNUmakefile | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index 6d57fae..8edb2f8 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -150,13 +150,18 @@ $(foreach al, $(autoloads), $(eval $(call RULE-srcdeps,
$(al))))
included_els := $(shell \
for pt in packages/*; do \
if [ -d $$pt ]; then \
- if [ -f "$${pt}/.elpaignore" ]; then \
- tar -ch $$pt/*.el --no-recursion \
- --exclude-vcs -X "$${pt}/.elpaignore" \
+ prev=$$(pwd); \
+ cd $$pt; \
+ if [ -f .elpaignore ]; then \
+ tar -ch *.el --no-recursion \
+ --exclude-vcs -X .elpaignore \
| tar --list; \
else \
- ls -1 $$pt/*.el; \
- fi; \
+ ls -1 *.el; \
+ fi | while read line; \
+ do echo "$${pt}/$${line}"; \
+ done; \
+ cd $$prev; \
fi; \
done)
els := $(call FILTER-nonsrc, $(included_els))
