diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2022-01-26 13:00:34 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2022-01-26 13:00:34 +0200 |
commit | 9b238b9b81a04554edbd6bc35d12aac0433cd511 (patch) | |
tree | 4873066ede5b9c1efcdc970603a4695bbcfb7e2b /libbuild2/bash/init.cxx | |
parent | 614ac547aabbf9c6168e3ad42dad6ee022de2080 (diff) |
Make bash module install into bin/<project>.bash/ to avoid clashes
Also, expect the first component in the import path to be full project
name even in case it has the .bash extension.
Diffstat (limited to 'libbuild2/bash/init.cxx')
-rw-r--r-- | libbuild2/bash/init.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libbuild2/bash/init.cxx b/libbuild2/bash/init.cxx index cf5307f..a1effa1 100644 --- a/libbuild2/bash/init.cxx +++ b/libbuild2/bash/init.cxx @@ -48,14 +48,13 @@ namespace build2 { using namespace install; - // Install into bin/<project>/ by default stripping the .bash - // extension from <project> if present. + // Install bash{} into bin/<project>.bash/ by default. // const project_name& p (project (rs)); if (!p.empty ()) { - install_path<bash> (bs, dir_path ("bin") /= project_base (p)); + install_path<bash> (bs, dir_path ("bin") /= modules_install_dir (p)); install_mode<bash> (bs, "644"); } } |