]>
Commit | Line | Data |
---|---|---|
6bb4510b JB |
1 | --- libhandy-1.2.0/meson.build.orig 2021-03-12 13:10:27.000000000 +0100 |
2 | +++ libhandy-1.2.0/meson.build 2021-04-01 20:30:07.815680135 +0200 | |
3 | @@ -103,13 +103,17 @@ | |
4 | ||
5 | # Setup various paths that subdirectory meson.build files need | |
6 | package_subdir = get_option('package_subdir') # When used as subproject | |
7 | -datadir = get_option('datadir') / package_subdir | |
8 | -libdir = get_option('libdir') / package_subdir | |
9 | -girdir = get_option('datadir') / package_subdir / 'gir-1.0' | |
10 | -typelibdir = get_option('libdir') / package_subdir / 'girepository-1.0' | |
11 | if package_subdir != '' | |
12 | + datadir = get_option('datadir') / package_subdir | |
13 | + libdir = get_option('libdir') / package_subdir | |
14 | + girdir = get_option('datadir') / package_subdir / 'gir-1.0' | |
15 | + typelibdir = get_option('libdir') / package_subdir / 'girepository-1.0' | |
16 | vapidir = get_option('datadir') / package_subdir / 'vapi' | |
17 | else | |
18 | + datadir = get_option('datadir') | |
19 | + libdir = get_option('libdir') | |
20 | + girdir = get_option('datadir') / 'gir-1.0' | |
21 | + typelibdir = get_option('libdir') / 'girepository-1.0' | |
22 | vapidir = get_option('datadir') / 'vala' / 'vapi' | |
23 | endif | |
24 |