diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-04-04 15:22:58 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-04-04 15:27:35 +0200 |
| commit | d19c883d509bb0926635a1a9b30c4875dbbbbfab (patch) | |
| tree | f2714ad8d1ed4fd660c84965b13e83e3feb10b9b | |
| parent | f1159d7c78ba5f4551603f2afc8b3b9dd07117ca (diff) | |
units: move user units from /usr/share to /usr/lib since they might be arch-dependent
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | systemd.pc.in | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 349316aa3f..efc969cca3 100644 --- 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 6a843fbde2..33c3f36a9f 100644 --- 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} |