[tracker/wip/carlosg/downgrade-meson-version: 1/2] build: Avoid install:true in configure_file()



commit b1c9fa69a86cbdd63ce7ca7d8e072b556429bc4c
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed May 1 14:25:09 2019 +0200

    build: Avoid install:true in configure_file()
    
    This is a meson 0.50 feature which we don't strictly need to rely on.
    According to meson docs: "When omitted it defaults to true when
    install_dir is set and not empty, false otherwise."
    
    In all places we use it we (obviously) define install_dir, so the
    files should be installed without it being specifically told so.

 data/meson.build                   | 1 -
 src/libtracker-control/meson.build | 1 -
 src/libtracker-miner/meson.build   | 1 -
 src/libtracker-sparql/meson.build  | 1 -
 src/tracker-store/meson.build      | 2 --
 5 files changed, 6 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 4c6b5c902..55ecb9862 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -10,7 +10,6 @@ foreach schema : tracker_gsettings_schemas
     input: schema,
     output: '@PLAINNAME@',
     copy: true,
-    install: true,
     install_dir: gsettings_schema_dir)
 endforeach
 
diff --git a/src/libtracker-control/meson.build b/src/libtracker-control/meson.build
index 533ac538e..5e4113cb1 100644
--- a/src/libtracker-control/meson.build
+++ b/src/libtracker-control/meson.build
@@ -49,7 +49,6 @@ configure_file(
     input: 'tracker-control.pc.in',
     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,
diff --git a/src/libtracker-miner/meson.build b/src/libtracker-miner/meson.build
index a3bd2d9d9..6d8e70af1 100644
--- a/src/libtracker-miner/meson.build
+++ b/src/libtracker-miner/meson.build
@@ -105,7 +105,6 @@ configure_file(
     input: 'tracker-miner.pc.in',
     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-@0@/libtracker-miner'.format(tracker_api_version))
diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
index 65985baad..a5db65314 100644
--- a/src/libtracker-sparql/meson.build
+++ b/src/libtracker-sparql/meson.build
@@ -91,7 +91,6 @@ configure_file(
     input: 'tracker-sparql.pc.in',
     output: 'tracker-sparql-@0@.pc'.format(tracker_api_version),
     configuration: conf,
-    install: true,
     install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'pkgconfig'))
 
 install_headers(
diff --git a/src/tracker-store/meson.build b/src/tracker-store/meson.build
index 857070c55..6e3cc2653 100644
--- a/src/tracker-store/meson.build
+++ b/src/tracker-store/meson.build
@@ -43,7 +43,6 @@ dbus_service_file = configure_file(
     input: 'org.freedesktop.Tracker1.service.in',
     output: 'org.freedesktop.Tracker1.service',
     configuration: conf,
-    install: true,
     install_dir: dbus_services_dir)
 
 i18n.merge_file('tracker-store-desktop-file',
@@ -59,7 +58,6 @@ if install_systemd_user_services
       input: 'tracker-store.service.in',
       output: 'tracker-store.service',
       configuration: conf,
-      install: true,
       install_dir: systemd_user_services_dir)
 endif
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]