[systemd-commits] Makefile.am src/bootchart

[Martin Pitt]

 Makefile.am               |    1 +
 src/bootchart/bootchart.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a804d849b3c2199bc25d1d4e65fc119fa4d7d0e2
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Tue Feb 24 14:30:10 2015 +0100

    bootchart: fix default init path
    
    Commit 6e1bf7ab99 used the wrong directory; we need rootlibexecdir, not
    rootlibdir, as the latter is something like /lib/x86_64-linux-gnu/ on
    multi-arch systems.
    
    https://launchpad.net/bugs/1423867

diff --git a/Makefile.am b/Makefile.am
index 8c7d000..7f01668 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -199,6 +199,7 @@ AM_CPPFLAGS = \
 	-DKEXEC=\"$(KEXEC)\" \
 	-DLIBDIR=\"$(libdir)\" \
 	-DROOTLIBDIR=\"$(rootlibdir)\" \
+	-DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
 	-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
 	-I $(top_srcdir)/src \
 	-I $(top_builddir)/src/shared \
diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index 2fac300..607ec42 100644
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -73,7 +73,7 @@ int sysfd=-1;
 #define DEFAULT_HZ 25.0
 #define DEFAULT_SCALE_X 100.0 /* 100px = 1sec */
 #define DEFAULT_SCALE_Y 20.0  /* 16px = 1 process bar */
-#define DEFAULT_INIT ROOTLIBDIR "/systemd/systemd"
+#define DEFAULT_INIT ROOTLIBEXECDIR "/systemd"
 #define DEFAULT_OUTPUT "/run/log"
 
 /* graph defaults */