[systemd-commits] 2 commits - Makefile.am systemd.pc.in units/systemd-logger.socket

[Lennart Poettering]

 Makefile.am                 |    4 +++-
 systemd.pc.in               |    2 +-
 units/systemd-logger.socket |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit d19c883d509bb0926635a1a9b30c4875dbbbbfab
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Apr 4 15:22:58 2011 +0200

    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 349316a..efc969c 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, at SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
 		-e 's, at pkgsysconfdir\@,$(pkgsysconfdir),g' \
 		-e 's, at pkgdatadir\@,$(pkgdatadir),g' \
+		-e 's, at pkglibdir\@,$(pkglibdir),g' \
 		-e 's, at systemunitdir\@,$(systemunitdir),g' \
+		-e 's, at userunitdir\@,$(userunitdir),g' \
 		-e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 		-e 's, at PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
 		-e 's, at PACKAGE_URL\@,$(PACKAGE_URL),g' \
diff --git a/systemd.pc.in b/systemd.pc.in
index 6a843fb..33c3f36 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}

commit f1159d7c78ba5f4551603f2afc8b3b9dd07117ca
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Apr 4 15:23:29 2011 +0200

    logger: name socket like service

diff --git a/units/systemd-logger.socket b/units/systemd-logger.socket
index 9b2d202..389b507 100644
--- a/units/systemd-logger.socket
+++ b/units/systemd-logger.socket
@@ -8,7 +8,7 @@
 # See systemd.special(7) for details
 
 [Unit]
-Description=Logging Socket
+Description=Stream Logging Socket
 DefaultDependencies=no
 Before=sockets.target