[gnome-user-share/wip/hadess/use-systemd-variable] build: Install in /usr/lib instead of /usr/lib64 on Fedora



commit 903898dddfc0e313e787773ae022ec3aa26c8fbf
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Sep 6 11:28:03 2019 +0200

    build: Install in /usr/lib instead of /usr/lib64 on Fedora
    
    When building gnome-user-share in Fedora, gnome-user-share-webdav.service
    ends up incorrectly placed in /usr/lib64/systemd/user. It should be in
    /usr/lib/systemd/user.
    
    This is caused by us building a path from scratch, so that the prefix
    could be overridden when doing an installation into a staging directory,
    as the path supplied in systemd's pkgconfig file was broken in this
    regard. This was however fixed in:
    https://github.com/systemd/systemd/issues/9595
    so use this instead.
    
    Closes: #22

 meson.build | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index 33ea7ce..bbcc15f 100644
--- a/meson.build
+++ b/meson.build
@@ -70,10 +70,7 @@ gio_schemasdir = gio_dep.get_pkgconfig_variable(
 # systemd user unit directory
 systemd_systemduserunitdir = get_option('systemduserunitdir')
 if systemd_systemduserunitdir == ''
-  # FIXME: this would ideally use the systemduserunitdir pkgconfig variable, but
-  # it does not depend on variables we can override to install within prefix.
-  #systemd_systemduserunitdir = dependency('systemd').get_pkgconfig_variable('systemduserunitdir')
-  systemd_systemduserunitdir = user_share_prefix / user_share_libdir / 'systemd/user'
+  systemd_systemduserunitdir = dependency('systemd').get_pkgconfig_variable('systemduserunitdir')
 endif
 
 httpd = find_program(get_option('httpd'), required: false)


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