mumble/trunk/mumble-1.5.517-pkgconf.patch

   1 diff -ruN a/auxiliary_files/CMakeLists.txt b/auxiliary_files/CMakeLists.txt
   2 --- a/auxiliary_files/CMakeLists.txt    2023-01-18 07:54:18.355957000 +0100
   3 +++ b/auxiliary_files/CMakeLists.txt    2023-01-22 00:35:54.387905181 +0100
   4 @@ -64,22 +64,12 @@
   5         file(COPY "config_files/mumble-server.conf" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
   6
   7         if(UNIX AND NOT APPLE)
   8 -               get_pkgconf_variable(
   9 -                       OUTPUT_VARIABLE SYSUSERS_DIR
  10 -                       MODULE systemd
  11 -                       VARIABLE_NAME sysusersdir
  12 -                       QUIET
  13 -               )
  14 +               pkg_get_variable(SYSUSERS_DIR systemd sysusersdir)
  15                 if(NOT SYSUSERS_DIR)
  16                         # Fallback value, in case it could not be fetched via pkg-config
  17                         set(SYSUSERS_DIR "${CMAKE_INSTALL_SYSCONFDIR}/sysconfig.d")
  18                 endif()
  19 -               get_pkgconf_variable(
  20 -                       OUTPUT_VARIABLE SYSTEMD_SERVICE_DIR
  21 -                       MODULE systemd
  22 -                       VARIABLE_NAME systemd_system_unit_dir
  23 -                       QUIET
  24 -               )
  25 +               pkg_get_variable(SYSTEMD_SERVICE_DIR systemd systemd_system_unit_dir)
  26                 if(NOT SYSTEMD_SERVICE_DIR)
  27                         # Default to /etc/systemd/system - This is not where packages ought to install their service files (rather
  28                         # it's where an admin is supposed to add their system files), but this seems to be the most consistent