units: move user units from /usr/share to /usr/lib since they might be arch-dependent

diff --git a/Makefile.am b/Makefile.am
index 349316aa3ff3956875dfdc81d289d00b204ab97c..efc969cca34cefd78be28b5f61aceceeb8fb37dd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
-userunitdir=$(pkgdatadir)/user
+userunitdir=$(pkglibdir)/user
 tmpfilesdir=$(sysconfdir)/tmpfiles.d
 usergeneratordir=$(pkglibexecdir)/user-generators
 
@@ -1130,7 +1130,9 @@ SED_PROCESS = \
                -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
                -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
                -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
+               -e 's,@pkglibdir\@,$(pkglibdir),g' \
                -e 's,@systemunitdir\@,$(systemunitdir),g' \
+               -e 's,@userunitdir\@,$(userunitdir),g' \
                -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
                -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
                -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \

diff --git a/systemd.pc.in b/systemd.pc.in
index 6a843fbde2b1d154b8714f301baedf6cb4d9480f..33c3f36a9f831e8551020fbf8d0f179542c3e4cf 100644 (file)
--- a/systemd.pc.in
+++ b/systemd.pc.in
@@ -8,7 +8,7 @@
 prefix=@prefix@
 exec_prefix=${prefix}
 systemdsystemunitdir=@systemunitdir@
-systemduserunitdir=@pkgdatadir@/user
+systemduserunitdir=@userunitdir@
 systemdsystemconfdir=@pkgsysconfdir@/system
 systemduserconfdir=@pkgsysconfdir@/user
 systemdsystemunitpath=/run/systemd/system:${systemdsystemconfdir}:/etc/systemd/system:/usr/local/share/systemd/system:/usr/share/systemd/system:/lib/systemd/system:${systemdsystemunitdir}