commit 1ac8e33e5a1d133f66d7aefab106a1f848f79eab parent 65775f44d5f3984c4746c4700aa3da57224cc89d Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Mon, 21 Feb 2022 01:27:47 +0100 cmd/haredoc: Fix default HAREPATH Closes: https://todo.sr.ht/~sircmpwn/hare/575 Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Diffstat:
| M | Makefile | | | 4 | +++- |
| M | cmd/haredoc/env.ha | | | 3 | +-- |
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile @@ -78,7 +78,9 @@ $(TESTCACHE)/hare.ssa: $(hare_srcs) $(testlib_deps_any) $(testlib_deps_$(PLATFOR .bin/haredoc: .bin/hare $(haredoc_srcs) @mkdir -p .bin @printf 'HARE\t$@\n' - @env HAREPATH=. ./.bin/hare build -o .bin/haredoc ./cmd/haredoc + @env HAREPATH=. ./.bin/hare build \ + -D HAREPATH:str='"'"$(HAREPATH)"'"' \ + -o .bin/haredoc ./cmd/haredoc docs/hare.1: docs/hare.scd docs/haredoc.1: docs/haredoc.scd diff --git a/cmd/haredoc/env.ha b/cmd/haredoc/env.ha @@ -16,6 +16,5 @@ fn default_tags() []module::tag = { }; fn default_harepath() str = { - // TODO: Same deal - return "/usr/share/src/hare/stdlib:/usr/share/src/hare/third-party"; + return HAREPATH; };