[systemd-commits] 2 commits - Makefile.am

[Lennart Poettering]

 Makefile.am |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit cb06add70d69eae1a990da283e1a582ee98a142d
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Apr 5 02:52:21 2011 +0200

    build-sys: we don't need rootsbindir anymore since we don't install anything to /sbin

diff --git a/Makefile.am b/Makefile.am
index 41e7a92..4e24480 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,11 +37,10 @@ usergeneratordir=$(pkglibexecdir)/user-generators
 # And these are the special ones for /
 rootdir=@rootdir@
 rootbindir=$(rootdir)/bin
-rootsbindir=$(rootdir)/sbin
 rootlibexecdir=$(rootdir)/lib/systemd
+systemgeneratordir=$(rootlibexecdir)/system-generators
+systemshutdowndir=$(rootlibexecdir)/system-shutdown
 systemunitdir=$(rootdir)/lib/systemd/system
-systemgeneratordir=$(rootdir)/lib/systemd/system-generators
-systemshutdowndir=$(rootdir)/lib/systemd/system-shutdown
 
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \

commit 32d0463d5c9982cc0c98a6e2867f94c764a496c2
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Apr 5 02:49:49 2011 +0200

    build-sys: better don't use libexecdir here at all

diff --git a/Makefile.am b/Makefile.am
index ee39cf0..41e7a92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,6 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-# Override libexecdir
-libexecdir=$(exec_prefix)/lib
-
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
@@ -33,7 +30,7 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
-userunitdir=$(pkglibexecdir)/user
+userunitdir=$(prefix)/lib/systemd/user
 tmpfilesdir=$(sysconfdir)/tmpfiles.d
 usergeneratordir=$(pkglibexecdir)/user-generators