From 360cc71a03b6f982f68a68518ccbb116236822f2 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Sun, 15 Feb 2015 21:30:12 +0000
Subject: usermerge systemd

---
 strata/foundation/systemd.morph | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph
index c298748a..df794ee2 100644
--- a/strata/foundation/systemd.morph
+++ b/strata/foundation/systemd.morph
@@ -4,17 +4,21 @@ max-jobs: 1
 build-system: autotools
 configure-commands:
 - sh autogen.sh
-- ./configure --prefix="$PREFIX" --enable-xz --disable-manpages --sysconfdir=/etc
-  --localstatedir=/var --libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" --with-rootprefix=
-  --with-rootlibdir=/lib
+- |
+  ./configure --prefix="$PREFIX" \
+              --enable-xz \
+              --disable-manpages \
+              --sysconfdir=/etc \
+              --localstatedir=/var \
+              --libdir="$PREFIX/lib"
 install-commands:
 - make DESTDIR="$DESTDIR" install
-- mkdir -p "$DESTDIR"/sbin
-- ln -s /lib/systemd/systemd "$DESTDIR"/sbin/init
-- for f in telinit runlevel shutdown poweroff reboot halt; do ln -s /bin/systemctl
-  "$DESTDIR/sbin/$f"; done
+- mkdir -p "$DESTDIR$PREFIX"/sbin
+- ln -s "$PREFIX"/lib/systemd/systemd "$DESTDIR$PREFIX"/sbin/init
+- for f in telinit runlevel shutdown poweroff reboot halt; do ln -s "$PREFIX"/bin/systemctl
+  "$DESTDIR$PREFIX/sbin/$f"; done
 - sed -e 's|@sushell@|/bin/sh|g' units/debug-shell.service.in >"$DESTDIR/etc/systemd/system/debug-shell.service"
-- sed -r -e '/Options=/s/,?strictatime//' "$DESTDIR/lib/systemd/system/tmp.mount"
+- sed -r -e '/Options=/s/,?strictatime//' "$DESTDIR$PREFIX/lib/systemd/system/tmp.mount"
   >"$DESTDIR/etc/systemd/system/tmp.mount"
 - touch "$DESTDIR/etc/machine-id"
 post-install-commands:
-- 
cgit v1.2.1