diff options
| author | Aleksey Filippov <alekseyf@google.com> | 2018-02-04 21:05:53 +0000 |
|---|---|---|
| committer | Aleksey Filippov <alekseyf@google.com> | 2018-02-05 01:28:07 +0000 |
| commit | 549f9a41e50c0cf0f8550462ab9bff169ff3a106 (patch) | |
| tree | 6cfddea3bd45d55cf5e94af5d09f37b52d1b93c8 /docs/markdown | |
| parent | 8ca3cc0c3db481b467233151e481a190cbb84c31 (diff) | |
| download | meson-549f9a41e50c0cf0f8550462ab9bff169ff3a106.zip meson-549f9a41e50c0cf0f8550462ab9bff169ff3a106.tar.gz meson-549f9a41e50c0cf0f8550462ab9bff169ff3a106.tar.bz2 | |
Rename install_subdir() option elide_directory to strip_directory
Diffstat (limited to 'docs/markdown')
| -rw-r--r-- | docs/markdown/Reference-manual.md | 8 | ||||
| -rw-r--r-- | docs/markdown/snippets/install_subdir-elide_directory.md | 4 | ||||
| -rw-r--r-- | docs/markdown/snippets/install_subdir-strip_directory.md | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md index e5fcb67..82f0b5a 100644 --- a/docs/markdown/Reference-manual.md +++ b/docs/markdown/Reference-manual.md @@ -772,7 +772,7 @@ installed with a `.gz` suffix. ### install_subdir() ``` meson - void install_subdir(subdir_name, install_dir : ..., exclude_files : ..., exclude_directories : ..., elide_directory : ...) + void install_subdir(subdir_name, install_dir : ..., exclude_files : ..., exclude_directories : ..., strip_directory : ...) ``` Installs the entire given subdirectory and its contents from the @@ -786,7 +786,7 @@ The following keyword arguments are supported: - `exclude_directories`: a list of directory names that should not be installed. Names are interpreted as paths relative to the `subdir_name` location. - `install_dir`: the location to place the installed subdirectory. -- `elide_directory`: install directory contents. `elide_directory=false` by default. +- `strip_directory`: install directory contents. `strip_directory=false` by default. Since 0.45.0 For a given directory `foo`: @@ -796,7 +796,7 @@ foo/ file1 file2 ``` -`install_subdir('foo', install_dir : 'share', elide_directory : false)` creates +`install_subdir('foo', install_dir : 'share', strip_directory : false)` creates ``` share/ foo/ @@ -805,7 +805,7 @@ share/ file2 ``` -`install_subdir('foo', install_dir : 'share', elide_directory : true)` creates +`install_subdir('foo', install_dir : 'share', strip_directory : true)` creates ``` share/ bar/ diff --git a/docs/markdown/snippets/install_subdir-elide_directory.md b/docs/markdown/snippets/install_subdir-elide_directory.md deleted file mode 100644 index 516a286..0000000 --- a/docs/markdown/snippets/install_subdir-elide_directory.md +++ /dev/null @@ -1,4 +0,0 @@ -## install_subdir() supports elide_directory - -If elide_directory=true install_subdir() installs directory contents -instead of directory itself, eliding name of the source directory. diff --git a/docs/markdown/snippets/install_subdir-strip_directory.md b/docs/markdown/snippets/install_subdir-strip_directory.md new file mode 100644 index 0000000..9ddb4a4 --- /dev/null +++ b/docs/markdown/snippets/install_subdir-strip_directory.md @@ -0,0 +1,4 @@ +## install_subdir() supports strip_directory + +If strip_directory=true install_subdir() installs directory contents +instead of directory itself, stripping basename of the source directory. |