From 44750a440fc376b68bcf042e41b5eeeea9549a91 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 4 May 2021 15:04:17 +0200 Subject: Add config.install.root with data_root/etc/ default --- doc/manual.cli | 2 ++ libbuild2/install/init.cxx | 2 ++ 2 files changed, 4 insertions(+) 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// 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// config.install.data @@ -5891,6 +5892,7 @@ lib exec_root/lib// install.lib libexec exec_root/libexec/// install.libexec pkgconfig lib/pkgconfig/ install.pkgconfig +etc data_root/etc/ install.etc include data_root/include// install.include share data_root/share/ install.share data share/// 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") /= "") /= ""); DIR (pkgconfig, dir_path ("lib") /= "pkgconfig"); + DIR (etc, dir_path ("data_root") /= "etc"); DIR (include, (dir_path ("data_root") /= "include") /= ""); DIR (share, dir_path ("data_root") /= "share"); DIR (data, (dir_path ("share") /= "") /= ""); @@ -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); -- cgit v1.1