[gnome-software] build: Remove redundant `install` arguments from configure_file() calls



commit 613025e9db26434631cca2ca9ead3b94983f2631
Author: Philip Withnall <withnall endlessm com>
Date:   Tue Jul 9 09:35:41 2019 +0100

    build: Remove redundant `install` arguments from configure_file() calls
    
    Meson installs the output from configure_file() if `install_dir` is
    specified; you don’t need to separately specify the `install` argument.
    Versions of Meson before 0.50 didn’t understand the `install` argument
    anyway. This fixes the following compiler warning:
    ```
    WARNING: Project targetting '>=0.46.0' but tried to use feature introduced in '0.50.0': install arg in 
configure_file
    ```
    
    Signed-off-by: Philip Withnall <withnall endlessm com>

 lib/meson.build | 1 -
 src/meson.build | 3 ---
 2 files changed, 4 deletions(-)
---
diff --git a/lib/meson.build b/lib/meson.build
index 766d379c..b74248a5 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -16,7 +16,6 @@ pkconf.set('VERSION', meson.project_version())
 configure_file(
   input : 'gnome-software.pc.in',
   output : 'gnome-software.pc',
-  install: true,
   install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
   configuration : pkconf
 )
diff --git a/src/meson.build b/src/meson.build
index 26954e0d..9c118ecc 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -182,7 +182,6 @@ cdata.set('bindir', join_paths(get_option('prefix'),
 configure_file(
   input : 'org.gnome.Software.service.in',
   output : 'org.gnome.Software.service',
-  install: true,
   install_dir: join_paths(get_option('datadir'), 'dbus-1/services'),
   configuration : cdata
 )
@@ -191,7 +190,6 @@ configure_file(
 configure_file(
   input : 'gnome-software-service.desktop.in',
   output : 'gnome-software-service.desktop',
-  install: true,
   install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'),
   configuration : cdata
 )
@@ -272,7 +270,6 @@ if get_option('packagekit')
   configure_file(
     input : 'org.freedesktop.PackageKit.service.in',
     output : 'org.freedesktop.PackageKit.service',
-    install: true,
     install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services'),
     configuration : cdata
   )


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