--- a/meson.build +++ b/meson.build @@ -137,7 +137,7 @@ mobile_broadband_provider_info_dep = dependency('mobile-broadband-provider-info') config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', mobile_broadband_provider_info_dep.get_pkgconfig_variable('database')) else - config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_prefix, 'share', 'mobile-broadband-provider-info', 'serviceproviders.xml')) + config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_datadir, 'mobile-broadband-provider-info', 'serviceproviders.xml')) endif gio_dep = dependency('gio-2.0', version: '>= 2.38') --- a/src/libnm-gtk/nm-mobile-providers.c +++ b/src/libnm-gtk/nm-mobile-providers.c @@ -30,10 +30,6 @@ #include "nm-mobile-providers.h" -#ifndef MOBILE_BROADBAND_PROVIDER_INFO -#define MOBILE_BROADBAND_PROVIDER_INFO DATADIR"/mobile-broadband-provider-info/serviceproviders.xml" -#endif - #define ISO_3166_COUNTRY_CODES ISO_CODES_PREFIX"/share/xml/iso-codes/iso_3166.xml" #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX"/share/locale" @@ -990,7 +986,7 @@ if (!country_codes) country_codes = ISO_3166_COUNTRY_CODES; if (!service_providers) - service_providers = MOBILE_BROADBAND_PROVIDER_INFO; + service_providers = MOBILE_BROADBAND_PROVIDER_INFO_DATABASE; countries = read_country_codes (country_codes, cancellable,