aboutsummaryrefslogtreecommitdiff
path: root/libbuild2
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2020-06-29 09:31:06 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2020-06-29 09:31:06 +0200
commit4155bd40e024f752b88c04c2beb3274e36fc804b (patch)
tree6c9d3e3c392081682728d2bfacc6bac088ec1ea9 /libbuild2
parent7daa7916182025d737f439da5fe5d67fe1a2fb8c (diff)
Add config.install.share variable
Its default value is data_root/share/ and it is now used as a common root for config.install.{data,doc,man} variables.
Diffstat (limited to 'libbuild2')
-rw-r--r--libbuild2/install/init.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/libbuild2/install/init.cxx b/libbuild2/install/init.cxx
index 480eec4..fe35757 100644
--- a/libbuild2/install/init.cxx
+++ b/libbuild2/install/init.cxx
@@ -159,12 +159,13 @@ namespace build2
static const dir_path dir_libexec (dir_path ("exec_root") /= "libexec");
static const dir_path dir_pkgconfig (dir_path ("lib") /= "pkgconfig");
- static const dir_path dir_data (dir_path ("data_root") /= "share");
static const dir_path dir_include (dir_path ("data_root") /= "include");
+ static const dir_path dir_share (dir_path ("data_root") /= "share");
+ static const dir_path dir_data ("share");
- static const dir_path dir_doc (dir_path (dir_data) /= "doc");
+ static const dir_path dir_doc (dir_path ("share") /= "doc");
static const dir_path dir_legal ("doc");
- static const dir_path dir_man (dir_path (dir_data) /= "man");
+ static const dir_path dir_man (dir_path ("share") /= "man");
static const dir_path dir_man1 (dir_path ("man") /= "man1");
static const group_rule group_rule_ (true /* see_through_only */);
@@ -263,8 +264,9 @@ namespace build2
set_dir (s, rs, "libexec", dir_path (dir_libexec) /= n, true);
set_dir (s, rs, "pkgconfig", dir_pkgconfig, false, "644");
- set_dir (s, rs, "data", dir_path (dir_data) /= n, true);
set_dir (s, rs, "include", dir_include);
+ set_dir (s, rs, "share", dir_share);
+ set_dir (s, rs, "data", dir_path (dir_data) /= n, true);
set_dir (s, rs, "doc", dir_path (dir_doc) /= n, true);
set_dir (s, rs, "legal", dir_legal);