diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2015-02-24 14:30:10 +0100 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2015-02-24 14:31:45 +0100 |
| commit | a804d849b3c2199bc25d1d4e65fc119fa4d7d0e2 (patch) | |
| tree | 2dba912e4fcc6683825867a74adf48fef8a49eb5 | |
| parent | def3f524a1e83e98b848ff98b40032ee59cbbf89 (diff) | |
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
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | src/bootchart/bootchart.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 8c7d000a28..7f01668c3f 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 2fac30039d..607ec42690 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 */ |