Skip to content

Commit 16f0f09

Browse files
committed
make: Fix LOAD_PATH
1 parent f619259 commit 16f0f09

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ include default.mk
33

44
.PHONY: test
55

6-
# https://github.com/emacscollective/workflows/blob/main/bin/install-deps
7-
# expects this to find this in this file.
8-
DEPS = compat
9-
106
all: lisp
117

128
help:

default.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
TOP := $(dir $(lastword $(MAKEFILE_LIST)))
1+
# LOAD_PATH has to work from "./" and "./test/".
2+
TOP := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
23

34
PKG = package-build
45

@@ -10,7 +11,7 @@ ELCS = $(ELS:.el=.elc)
1011

1112
DEPS = compat
1213

13-
LOAD_PATH ?= $(addprefix -L ../../,$(DEPS))
14+
LOAD_PATH ?= $(addprefix -L $(TOP)../,$(DEPS))
1415
LOAD_PATH += -L .
1516

1617
VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0 | cut -c2-)

0 commit comments

Comments
 (0)