diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2020-06-29 09:31:06 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2020-06-29 09:31:06 +0200 |
| commit | 4155bd40e024f752b88c04c2beb3274e36fc804b (patch) | |
| tree | 6c9d3e3c392081682728d2bfacc6bac088ec1ea9 | |
| parent | 7daa7916182025d737f439da5fe5d67fe1a2fb8c (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.
| -rw-r--r-- | doc/manual.cli | 7 | ||||
| -rw-r--r-- | libbuild2/install/init.cxx | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/doc/manual.cli b/doc/manual.cli index 104d6cd..bb4f57b 100644 --- a/doc/manual.cli +++ b/doc/manual.cli @@ -2244,12 +2244,13 @@ lib exec_root/lib/ config.install.lib libexec exec_root/libexec/<project>/ config.install.libexec pkgconfig lib/pkgconfig/ config.install.pkgconfig -data data_root/share/<project>/ config.install.data include data_root/include/ config.install.include +share data_root/share/ config.install.share +data share/<project>/ config.install.data -doc data_root/share/doc/<project>/ config.install.doc +doc share/doc/<project>/ config.install.doc legal doc/ config.install.legal -man data_root/share/man/ config.install.man +man share/man/ config.install.man man<N> man/man<N>/ config.install.man<N> \ 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); |