Skip to content

Commit c6b6d48

Browse files
committed
make: Require Transient/Compat paths to be explicitly set
Don't assume that the top-level of the Transient and Compat repos reside in the same directory as this repo.
1 parent 4816da4 commit c6b6d48

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ jobs:
4343
run: make -C compat compile
4444
- name: Build transient
4545
run: make -C transient lisp
46+
- name: Set envvars for dependencies
47+
run: |
48+
echo "COMPAT_DIR=$PWD/compat" >>$GITHUB_ENV
49+
echo "TRANSIENT_DIR=$PWD/transient/lisp" >>$GITHUB_ENV
4650
- name: Build snakemake-mode
4751
run: make -C snakemake-mode all
4852
- name: Test snakemake-mode

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
*-autoloads.el
22
*.elc
33
/.deps
4+
/config.mk

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11

2-
LOAD_PATH = -L ../compat -L ../transient/lisp -L .
2+
-include config.mk
3+
4+
COMPAT_DIR ?= /dev/null
5+
TRANSIENT_DIR ?= /dev/null
6+
7+
LOAD_PATH = -L $(COMPAT_DIR) -L $(TRANSIENT_DIR) -L .
38
EMACS = emacs
49
BATCH = $(EMACS) -Q --batch $(LOAD_PATH)
510

0 commit comments

Comments
 (0)