From 9da99e7a59cafdb9746ccd0cc148e454f0fa8b44 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 3 Aug 2021 10:31:56 -0400 Subject: destdir: Allow relative to build directory Meson already works like that, except in do_copydir() that requires absolute destdir. Better explicitly support that instead of leaving it undefined and unconsistent. --- docs/markdown/Commands.md | 3 +++ docs/markdown/Installing.md | 6 ++++++ docs/markdown/snippets/relative_destdir.md | 6 ++++++ 3 files changed, 15 insertions(+) create mode 100644 docs/markdown/snippets/relative_destdir.md (limited to 'docs/markdown') diff --git a/docs/markdown/Commands.md b/docs/markdown/Commands.md index 3f3cf9f..ea68cc8 100644 --- a/docs/markdown/Commands.md +++ b/docs/markdown/Commands.md @@ -190,6 +190,9 @@ Install project to `$DESTDIR/prefix`: DESTDIR=/path/to/staging/area meson install -C builddir ``` +Since *0.60.0* `DESTDIR` and `--destdir` can be a path relative to build +directory. An absolute path will be set into environment when executing scripts. + ### rewrite *(since 0.50.0)* diff --git a/docs/markdown/Installing.md b/docs/markdown/Installing.md index 0e5cb12..42c71f1 100644 --- a/docs/markdown/Installing.md +++ b/docs/markdown/Installing.md @@ -113,6 +113,12 @@ is used just like with other build systems: $ DESTDIR=/path/to/staging/area meson install ``` +Since *0.57.0* `--destdir` argument can be used instead of environment. In that +case Meson will set `DESTDIR` into environment when runing install scripts. + +Since *0.60.0* `DESTDIR` and `--destdir` can be a path relative to build +directory. An absolute path will be set into environment when executing scripts. + ## Custom install behaviour Installation behaviour can be further customized using additional diff --git a/docs/markdown/snippets/relative_destdir.md b/docs/markdown/snippets/relative_destdir.md new file mode 100644 index 0000000..1498646 --- /dev/null +++ b/docs/markdown/snippets/relative_destdir.md @@ -0,0 +1,6 @@ +## Install DESTDIR relative to build directory + +When `DESTDIR` environment or `meson install --destdir` option is a relative path, +it is now assumed to be relative to the build directory. An absolute path will be +set into environment when executing scripts. It was undefined behavior in prior +Meson versions but was working as relative to build directory most of the time. -- cgit v1.1