From f48d815b79e75c8efc4406d444a6b099de5b52a9 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Thu, 21 Feb 2019 18:14:20 +0100
Subject: meson: Remove unneeded parameters

These are already implicit.
---
 champlain-gtk/meson.build |  5 -----
 champlain/meson.build     | 10 ----------
 meson.build               |  9 ---------
 3 files changed, 24 deletions(-)

diff --git a/champlain-gtk/meson.build b/champlain-gtk/meson.build
index 5618d6c..4df766e 100644
--- a/champlain-gtk/meson.build
+++ b/champlain-gtk/meson.build
@@ -48,7 +48,6 @@ libchamplain_gtk_sha = library(
   c_args: libchamplain_gtk_c_args,
   link_args: libchamplain_gtk_link_args,
   install: true,
-  install_dir: libdir,
 )
 
 libchamplain_gtk_dep_sources = [
@@ -74,8 +73,6 @@ if generate_gir
     includes: ['Clutter-1.0', 'Gtk-3.0', libchamplain_gir.get(0)],
     link_with: libchamplain_gtk_sha,
     install: true,
-    install_dir_gir: girdir,
-    install_dir_typelib: typelibdir,
     extra_args: [
       '-DCHAMPLAIN_GTK_COMPILATION',
     ]
@@ -100,7 +97,6 @@ if generate_gir
       sources: libchamplain_gtk_gir.get(0),
       packages: libchamplain_gtk_vapi_packages,
       install: true,
-      install_dir: vapidir,
     )
   endif
 endif
@@ -116,6 +112,5 @@ libchamplain_gtk_pc = pkg.generate(
   libchamplain_gtk_sha,
   description: 'Gtk+ Widget wrapper for libchamplain',
   subdirs: package_string,
-  install_dir: pkgconfigdir,
   requires: libchamplain_gtk_requires + [libchamplain_sha],
 )
diff --git a/champlain/meson.build b/champlain/meson.build
index 88d8094..3285c65 100644
--- a/champlain/meson.build
+++ b/champlain/meson.build
@@ -127,8 +127,6 @@ endif
 libchamplain_features_h = configure_file(
   output: 'champlain-features.h',
   configuration: features_h,
-  install: true,
-  install_dir: libchamplain_includedir,
 )
 
 version_h = configuration_data()
@@ -141,8 +139,6 @@ libchamplain_version_h = configure_file(
   input: 'champlain-version.h.in',
   output: 'champlain-version.h',
   configuration: version_h,
-  install: true,
-  install_dir: libchamplain_includedir,
 )
 
 libchamplain_public_h += [
@@ -179,7 +175,6 @@ libchamplain_sha = library(
   c_args: libchamplain_c_args,
   link_args: libchamplain_link_args,
   install: true,
-  install_dir: libdir,
 )
 
 libchamplain_dep_sources = [
@@ -210,8 +205,6 @@ if generate_gir
     includes: libchamplain_gir_includes,
     link_with: libchamplain_sha,
     install: true,
-    install_dir_gir: girdir,
-    install_dir_typelib: typelibdir,
     extra_args: [
       '-DCHAMPLAIN_COMPILATION',
     ]
@@ -234,7 +227,6 @@ if generate_gir
       sources: libchamplain_gir.get(0),
       packages: libchamplain_vapi_packages,
       install: true,
-      install_dir: vapidir,
     )
   endif
 endif
@@ -248,9 +240,7 @@ libchamplain_dep = declare_dependency(
 
 libchamplain_pc = pkg.generate(
   libchamplain_sha,
-  name: package_string,
   description: 'Map View for Clutter',
   subdirs: package_string,
-  install_dir: pkgconfigdir,
   requires: libchamplain_requires,
 )
diff --git a/meson.build b/meson.build
index 73cf9c3..89e0e65 100644
--- a/meson.build
+++ b/meson.build
@@ -40,20 +40,11 @@ package_gtk_string = '@0@-@1@'.format(package_gtk_name, api_version)
 # Paths
 rootdir = include_directories('.')
 
-srcdir = meson.current_source_dir()
-builddir = meson.current_build_dir()
-
 prefix = get_option('prefix')
-
 includedir = join_paths(prefix, get_option('includedir'))
 libdir = join_paths(prefix, get_option('libdir'))
 datadir = join_paths(prefix, get_option('datadir'))
 pkgincludedir = join_paths(includedir, package_string)
-typelibdir = join_paths(libdir, 'girepository-1.0')
-pkgconfigdir = join_paths(libdir, 'pkgconfig')
-
-girdir = join_paths(datadir, 'gir-1.0')
-vapidir = join_paths(datadir, 'vala', 'vapi')
 
 # Dependencies
 cc = meson.get_compiler('c')
-- 
cgit v1.2.1