meson: Fix all hardcoded references to 1.0

In some places I had hardcoded '1.0' instead of honouring
tracker_api_version variable. This is now fixed.

4 files changed, 11 insertions, 11 deletions

diff --git a/src/libtracker-control/meson.build b/src/libtracker-control/meson.build
index f7cb1714a..80060ecc6 100644
--- a/src/libtracker-control/meson.build
+++ b/src/libtracker-control/meson.build
@@ -32,10 +32,10 @@ tracker_control_gir = gnome.generate_gir(libtracker_control,
 
 configure_file(
     input: 'tracker-control.pc.in',
-    output: 'tracker-control-1.0.pc',
+    output: 'tracker-control-@0@.pc'.format(tracker_api_version),
     configuration: conf,
     install: true,
     install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'pkgconfig'))
 
 install_headers (headers,
-    subdir: 'tracker-1.0/libtracker-control')
+    subdir: 'tracker-@0@/libtracker-control'.format(tracker_api_version))
diff --git a/src/libtracker-miner/meson.build b/src/libtracker-miner/meson.build
index fcd2a4566..1647475ff 100644
--- a/src/libtracker-miner/meson.build
+++ b/src/libtracker-miner/meson.build
@@ -81,7 +81,7 @@ tracker_miner_gir = gnome.generate_gir(libtracker_miner,
     namespace: 'TrackerMiner',
     identifier_prefix: 'Tracker',
     symbol_prefix: 'tracker',
-    # FIXME: also depends on Tracker-1.0.gir (output of libtracker-sparql)
+    # FIXME: also depends on Tracker-2.0.gir (output of libtracker-sparql)
     # but we can't currently access that from the Vala target
     includes : ['GLib-2.0', 'GObject-2.0', 'Gio-2.0' ],
     install: true,
@@ -91,14 +91,14 @@ tracker_miner_gir = gnome.generate_gir(libtracker_miner,
 
 configure_file(
     input: 'tracker-miner.pc.in',
-    output: 'tracker-miner-1.0.pc',
+    output: 'tracker-miner-@0@.pc'.format(tracker_api_version),
     configuration: conf,
     install: true,
     install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'pkgconfig'))
 
-install_headers(miner_headers, subdir: 'tracker-1.0/libtracker-miner')
+install_headers(miner_headers, subdir: 'tracker-@0@/libtracker-miner'.format(tracker_api_version))
 
 # Work around https://github.com/mesonbuild/meson/issues/705
 meson.add_install_script('../install-generated-header.sh',
     join_paths(meson.current_build_dir(), 'tracker-miner-enum-types.h'),
-    join_paths(get_option('prefix'), get_option('includedir'), 'tracker-1.0', 'libtracker-miner'))
+    join_paths(get_option('prefix'), get_option('includedir'), 'tracker-@0@'.format(tracker_api_version), 'libtracker-miner'))
diff --git a/src/libtracker-sparql-backend/meson.build b/src/libtracker-sparql-backend/meson.build
index 8ebb4ad3c..c68eba8db 100644
--- a/src/libtracker-sparql-backend/meson.build
+++ b/src/libtracker-sparql-backend/meson.build
@@ -47,13 +47,13 @@ tracker_sparql_gir = custom_target('tracker-sparql-gir',
     command: [g_ir_merge, '--namespace', 'Tracker', '--nsversion', tracker_api_version, '@INPUT@', tracker_sparql_vala_gir],
     input: [tracker_sparql_c_gir],
     capture: true,
-    output: 'Tracker-1.0.gir',
+    output: 'Tracker-@0@.gir'.format(tracker_api_version),
     install: true,
     install_dir: gir_dir)
 
 tracker_sparql_typelib = custom_target('tracker-sparql-typelib',
     command: [g_ir_compiler, '--output', '@OUTPUT@', '@INPUT@'],
     input: tracker_sparql_gir,
-    output: 'Tracker-1.0.typelib',
+    output: 'Tracker-@0@.typelib'.format(tracker_api_version),
     install: true,
     install_dir: typelib_dir)
diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
index 129f67330..fc2b9b5a8 100644
--- a/src/libtracker-sparql/meson.build
+++ b/src/libtracker-sparql/meson.build
@@ -84,7 +84,7 @@ tracker_sparql_intermediate_dep = declare_dependency(
 
 configure_file(
     input: 'tracker-sparql.pc.in',
-    output: 'tracker-sparql-1.0.pc',
+    output: 'tracker-sparql-@0@.pc'.format(tracker_api_version),
     configuration: conf,
     install: true,
     install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'pkgconfig'))
@@ -93,13 +93,13 @@ install_headers(
     libtracker_sparql_c_public_headers,
     'tracker-ontologies.h',
     'tracker-sparql.h',
-    subdir: 'tracker-1.0/libtracker-sparql')
+    subdir: 'tracker-@0@/libtracker-sparql'.format(tracker_api_version))
 
 # FIXME: we need a custom script to install generated Vala headers; see
 # <https://github.com/mesonbuild/meson/issues/705>.
 meson.add_install_script('../install-generated-header.sh',
     join_paths(meson.current_build_dir(), 'tracker-generated.h'),
-    join_paths(get_option('prefix'), get_option('includedir'), 'tracker-1.0', 'libtracker-sparql'))
+    join_paths(get_option('prefix'), get_option('includedir'), 'tracker-@0@'.format(tracker_api_version), 'libtracker-sparql'))
 
 # FIXME: we can't depend properly on the generated .vapi to do this.
 custom_target('tracker-sparql-' + tracker_api_version + '.vapi',