From 52b41a8b31abe285deb76ffc390a234a77ed0275 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Wed, 4 Jun 2025 16:20:40 -0400 Subject: [PATCH] deft update: ingest-spec-file: correctly merge locators Fixes #40 --- sources/workspaces/lid.dylan | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sources/workspaces/lid.dylan b/sources/workspaces/lid.dylan index deb3e29..30c268f 100644 --- a/sources/workspaces/lid.dylan +++ b/sources/workspaces/lid.dylan @@ -154,8 +154,9 @@ define function ingest-spec-file // Generate "protocol", "skeletons", and "stubs" registries for CORBA projects. // The sources for these projects won't exist until generated by the build. // Assume .../foo.idl generates .../stubs/foo-stubs.hdp etc. - let idl-path = file-locator(locator-directory(spec-path), - lid-value(spec, $idl-file-key, error?: #t)); + let idl-path = merge-locators(as(, + lid-value(spec, $idl-file-key, error?: #t)), + locator-directory(spec-path)); let idl-name = locator-base(idl-path); let prefix = lid-value(spec, $prefix-key); for (kind in #("protocol", "skeletons", "stubs"))