prefer "/lib/systemd/system" path over "/usr/lib/systemd/system"

git-svn-id: https://xpra.org/svn/Xpra/trunk@15947 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · May 24, 2017 · a68d10f · a68d10f
1 parent 26b183c
commit a68d10f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/rpmbuild/xpra.spec b/rpmbuild/xpra.spec
@@ -527,8 +527,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mime/packages/application-x-xpraconfig.xml
 
 %files common-server
-%{_prefix}/lib/systemd/system/xpra.service
-%{_prefix}/lib/systemd/system/xpra.socket
+/lib/systemd/system/xpra.service
+/lib/systemd/system/xpra.socket
 %{_prefix}/lib/cups/backend/xpraforwarder
 %config(noreplace) %{_sysconfdir}/sysconfig/xpra
 %config %{_prefix}/lib/tmpfiles.d/xpra.conf

diff --git a/src/setup.py b/src/setup.py
@@ -1549,15 +1549,15 @@ def copytodir(src, dst_dir, chmod=0o644):
             if service_ENABLED:
                 #Linux init service:
                 if os.path.exists("/bin/systemctl"):
-                    copytodir("service/xpra.service", "lib/systemd/system")
+                    copytodir("service/xpra.service", "/lib/systemd/system")
                 else:
                     copytodir("service/xpra", "/etc/init.d")
                 if os.path.exists("/etc/sysconfig"):
                     copytodir("etc/sysconfig/xpra", "/etc/sysconfig")
                 elif os.path.exists("/etc/default"):
                     copytodir("etc/sysconfig/xpra", "/etc/default")
             if sd_listen_ENABLED:
-                copytodir("service/xpra.socket", "lib/systemd/system")
+                copytodir("service/xpra.socket", "/lib/systemd/system")
 
 
     # add build_conf to build step