aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2021-05-04 15:04:17 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2021-05-04 15:04:17 +0200
commit44750a440fc376b68bcf042e41b5eeeea9549a91 (patch)
tree0485253619f817472d6d6e8af8c690221bead0b3
parentd1116775abe546187a979b2481c786b51c2eab0c (diff)
Add config.install.root with data_root/etc/ default
-rw-r--r--doc/manual.cli2
-rw-r--r--libbuild2/install/init.cxx2
2 files changed, 4 insertions, 0 deletions
diff --git a/doc/manual.cli b/doc/manual.cli
index b12fa84..d344f42 100644
--- a/doc/manual.cli
+++ b/doc/manual.cli
@@ -2288,6 +2288,7 @@ lib exec_root/lib/ config.install.lib
libexec exec_root/libexec/<project>/ config.install.libexec
pkgconfig lib/pkgconfig/ config.install.pkgconfig
+etc data_root/etc/ config.install.etc
include data_root/include/ config.install.include
share data_root/share/ config.install.share
data share/<project>/ config.install.data
@@ -5891,6 +5892,7 @@ lib exec_root/lib/<private>/ install.lib
libexec exec_root/libexec/<private>/<project>/ install.libexec
pkgconfig lib/pkgconfig/ install.pkgconfig
+etc data_root/etc/ install.etc
include data_root/include/<private>/ install.include
share data_root/share/ install.share
data share/<private>/<project>/ install.data
diff --git a/libbuild2/install/init.cxx b/libbuild2/install/init.cxx
index 14045e1..677ee07 100644
--- a/libbuild2/install/init.cxx
+++ b/libbuild2/install/init.cxx
@@ -278,6 +278,7 @@ namespace build2
DIR (libexec, ((dir_path ("exec_root") /= "libexec") /= "<private>") /= "<project>");
DIR (pkgconfig, dir_path ("lib") /= "pkgconfig");
+ DIR (etc, dir_path ("data_root") /= "etc");
DIR (include, (dir_path ("data_root") /= "include") /= "<private>");
DIR (share, dir_path ("data_root") /= "share");
DIR (data, (dir_path ("share") /= "<private>") /= "<project>");
@@ -460,6 +461,7 @@ namespace build2
set_dir (s, p, rs, "libexec", dir_libexec);
set_dir (s, p, rs, "pkgconfig", dir_pkgconfig, false, "644");
+ set_dir (s, p, rs, "etc", dir_etc);
set_dir (s, p, rs, "include", dir_include);
set_dir (s, p, rs, "share", dir_share);
set_dir (s, p, rs, "data", dir_data);