diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2018-10-19 17:01:45 +0200 |
|---|---|---|
| committer | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2018-10-21 00:22:40 +0200 |
| commit | cc6cd9d569df4ed2c0dad39dcee0cadea6416e59 (patch) | |
| tree | 9bb344fca53186f8ce2dddd76cb1f3a85a5a9af3 | |
| parent | 709135ad94deaa3be191f3b3a0b66c0e1546266f (diff) | |
| download | geoclue-cc6cd9d569df4ed2c0dad39dcee0cadea6416e59.tar.gz | |
build: Rename abs_header_dir to include_subdir
This is a better name as it's not absolute but a subdirectory of the
includedir, relative to the prefix.
Also rename the identical install_dir in public-api.
| -rw-r--r-- | libgeoclue/meson.build | 8 | ||||
| -rw-r--r-- | public-api/meson.build | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libgeoclue/meson.build b/libgeoclue/meson.build index bdf72e0..2ae5af9 100644 --- a/libgeoclue/meson.build +++ b/libgeoclue/meson.build @@ -1,5 +1,5 @@ header_dir = 'libgeoclue-' + gclue_api_version -abs_header_dir = join_paths(get_option('includedir'), header_dir) +include_subdir = join_paths(get_option('includedir'), header_dir) # FIXME: meson 0.46 doesn't seem to be actually installing the headers # generated by gnome.gdbus_codegen: @@ -12,21 +12,21 @@ gclue_client = gnome.gdbus_codegen('gclue-client', interface_prefix: 'org.freedesktop.GeoClue2.', namespace: 'GClue', install_header: true, - install_dir: abs_header_dir) + install_dir: include_subdir) # Location interface gclue_location = gnome.gdbus_codegen('gclue-location', '../src/org.freedesktop.GeoClue2.Location.xml', interface_prefix: 'org.freedesktop.GeoClue2.', namespace: 'GClue', install_header: true, - install_dir: abs_header_dir) + install_dir: include_subdir) # Manager interface gclue_manager = gnome.gdbus_codegen('gclue-manager', '../src/org.freedesktop.GeoClue2.Manager.xml', interface_prefix: 'org.freedesktop.GeoClue2.', namespace: 'GClue', install_header: true, - install_dir: abs_header_dir) + install_dir: include_subdir) libgeoclue_sources = files('gclue-helpers.c', 'gclue-simple.c') libgeoclue_sources += gclue_client[0] diff --git a/public-api/meson.build b/public-api/meson.build index b0caff4..5772aaa 100644 --- a/public-api/meson.build +++ b/public-api/meson.build @@ -2,7 +2,7 @@ headers = [ 'gclue-enums.h' ] header_dir = 'libgeoclue-' + gclue_api_version install_headers(headers, subdir: header_dir) -install_dir = join_paths(get_option('includedir'), header_dir) +include_subdir = join_paths(get_option('includedir'), header_dir) libgeoclue_public_api_gen_sources = gnome.mkenums_simple( 'gclue-enum-types', @@ -10,7 +10,7 @@ libgeoclue_public_api_gen_sources = gnome.mkenums_simple( header_prefix: '#include <gclue-enums.h>', decorator : 'GCLUE_ENUMS_H', install_header: true, - install_dir: install_dir) + install_dir: include_subdir) libgeoclue_public_api_sources = [ libgeoclue_public_api_gen_sources, 'gclue-enums.c' ] |