[glib-networking] Revert "build: Retrieve D-Bus and systemd paths"



commit dffcc7e65a6463f4699e3bbbdde905b684211d81
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Tue Nov 21 16:49:38 2017 -0600

    Revert "build: Retrieve D-Bus and systemd paths"
    
    This reverts commit 101561dc4b28a4ab544c3a498003bc72eddaa63b.

 meson.build                |    6 ------
 proxy/libproxy/meson.build |    4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/meson.build b/meson.build
index 261195f..d807b6a 100644
--- a/meson.build
+++ b/meson.build
@@ -51,12 +51,6 @@ assert(gio_module_dir != '', 'GIO_MODULE_DIR is missing from gio-2.0.pc')
 # *** Checks for LibProxy   ***
 enable_libproxy_support = get_option('libproxy_support')
 if enable_libproxy_support
-  dbus_service_dir = dependency('dbus-1').get_pkgconfig_variable('session_bus_services_dir')
-  assert(dbus_service_dir != '', 'session_bus_services_dir is missing from dbus-1.pc')
-
-  systemd_user_unit_dir = dependency('systemd').get_pkgconfig_variable('systemduserunitdir')
-  assert(systemd_user_unit_dir != '', 'systemduserunitdir is missing from systemd.pc')
-
   libproxy_dep = dependency('libproxy-1.0', version: '>= 0.3.1', required: true)
 endif
 
diff --git a/proxy/libproxy/meson.build b/proxy/libproxy/meson.build
index bb88445..0db801a 100644
--- a/proxy/libproxy/meson.build
+++ b/proxy/libproxy/meson.build
@@ -7,7 +7,7 @@ configure_file(
   input: service + '.in',
   output: service,
   install: true,
-  install_dir: dbus_service_dir,
+  install_dir: join_paths(datadir, 'dbus-1', 'services'),
   configuration: service_conf
 )
 
@@ -17,7 +17,7 @@ configure_file(
   input: service + '.in',
   output: service,
   install: true,
-  install_dir: systemd_user_unit_dir,
+  install_dir: join_paths(libdir, 'systemd', 'user'),
   configuration: service_conf
 )
 


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