diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-05-30 21:48:03 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-05-30 21:48:03 +0300 |
| commit | beb68274138e6f6140c03709c59b57379a94a7c0 (patch) | |
| tree | ff8f0443325772b411be97bfccf30dd32ad74712 /test cases | |
| parent | 144565fabff7c872b7c45970bb0e30235b2e9324 (diff) | |
| download | meson-beb68274138e6f6140c03709c59b57379a94a7c0.zip meson-beb68274138e6f6140c03709c59b57379a94a7c0.tar.gz meson-beb68274138e6f6140c03709c59b57379a94a7c0.tar.bz2 | |
Installing subdirs now merges with existing files in the target dir.
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/common/66 install subdir/installed_files.txt | 1 | ||||
| -rw-r--r-- | test cases/common/66 install subdir/meson.build | 1 | ||||
| -rw-r--r-- | test cases/common/66 install subdir/sub1/second.dat | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/test cases/common/66 install subdir/installed_files.txt b/test cases/common/66 install subdir/installed_files.txt index 93ee283..fb60d74 100644 --- a/test cases/common/66 install subdir/installed_files.txt +++ b/test cases/common/66 install subdir/installed_files.txt @@ -1,2 +1,3 @@ usr/share/sub1/data1.dat +usr/share/sub1/second.dat usr/share/sub1/sub2/data2.dat diff --git a/test cases/common/66 install subdir/meson.build b/test cases/common/66 install subdir/meson.build index 16062b0..d153213 100644 --- a/test cases/common/66 install subdir/meson.build +++ b/test cases/common/66 install subdir/meson.build @@ -1,3 +1,4 @@ project('install a whole subdir', 'c') subdir('subdir') +install_subdir('sub1', install_dir : 'share') diff --git a/test cases/common/66 install subdir/sub1/second.dat b/test cases/common/66 install subdir/sub1/second.dat new file mode 100644 index 0000000..48857a8 --- /dev/null +++ b/test cases/common/66 install subdir/sub1/second.dat @@ -0,0 +1 @@ +Test that multiple install_subdirs meld their results.
\ No newline at end of file |