shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-12 13:18:14 +03:00
Code

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

Browse Source
This commit is contained in:
Lennart Poettering 2011-04-04 15:22:58 +02:00
parent f1159d7c78
commit d19c883d50
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

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

2
systemd.pc.in
View File

@ -8,7 +8,7 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=${prefix} exec_prefix=${prefix}
systemdsystemunitdir=@systemunitdir@ systemdsystemunitdir=@systemunitdir@
systemduserunitdir=@pkgdatadir@/user systemduserunitdir=@userunitdir@
systemdsystemconfdir=@pkgsysconfdir@/system systemdsystemconfdir=@pkgsysconfdir@/system
systemduserconfdir=@pkgsysconfdir@/user systemduserconfdir=@pkgsysconfdir@/user
systemdsystemunitpath=/run/systemd/system:${systemdsystemconfdir}:/etc/systemd/system:/usr/local/share/systemd/system:/usr/share/systemd/system:/lib/systemd/system:${systemdsystemunitdir} systemdsystemunitpath=/run/systemd/system:${systemdsystemconfdir}:/etc/systemd/system:/usr/local/share/systemd/system:/usr/share/systemd/system:/lib/systemd/system:${systemdsystemunitdir}