diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-02-15 19:13:21 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-02-15 19:13:21 +0200 |
| commit | 99bb73e6c96655fe335dbeca6ae2f8dc7986d213 (patch) | |
| tree | 76a40ac85b13a3a7be14a65202c1ffd9d8ad5faf /test cases | |
| parent | 7c074fd9535e8dbe2f32a5b322ce8e25b27cce8a (diff) | |
| download | meson-99bb73e6c96655fe335dbeca6ae2f8dc7986d213.tar.gz | |
Changed install_data to get rid of useless and confusing target subdir name.
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/common/12 data/meson.build | 4 | ||||
| -rw-r--r-- | test cases/common/12 data/vanishing/meson.build | 2 | ||||
| -rw-r--r-- | test cases/common/52 custom install dirs/meson.build | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/test cases/common/12 data/meson.build b/test cases/common/12 data/meson.build index 5a04d6c42..2193f94d2 100644 --- a/test cases/common/12 data/meson.build +++ b/test cases/common/12 data/meson.build @@ -1,4 +1,4 @@ project('data install test', 'c') -install_data('progname', sources : 'datafile.dat') -install_data('dummy', sources : 'etcfile.dat', install_dir : '/etc') +install_data(sources : 'datafile.dat', install_dir : 'share/progname') +install_data(sources : 'etcfile.dat', install_dir : '/etc') subdir('vanishing') diff --git a/test cases/common/12 data/vanishing/meson.build b/test cases/common/12 data/vanishing/meson.build index d2283e701..1a27137c8 100644 --- a/test cases/common/12 data/vanishing/meson.build +++ b/test cases/common/12 data/vanishing/meson.build @@ -1 +1 @@ -install_data('progname', sources : 'vanishing.dat')
\ No newline at end of file +install_data(sources : 'vanishing.dat', install_dir : 'share/progname') diff --git a/test cases/common/52 custom install dirs/meson.build b/test cases/common/52 custom install dirs/meson.build index 8f929b82c..622ecadd7 100644 --- a/test cases/common/52 custom install dirs/meson.build +++ b/test cases/common/52 custom install dirs/meson.build @@ -1,6 +1,5 @@ project('custom install dirs', 'c') - executable('prog', 'prog.c', install : true, install_dir : 'dib/dab/dub') install_headers('sample.h', install_dir : 'some/dir') install_man('prog.1', install_dir : 'woman') -install_data('foobar', 'datafile.cat', install_dir : 'meow') +install_data('datafile.cat', install_dir : 'meow') |