4 files changed, 25 insertions, 13 deletions
diff --git a/strata/foundation/acl.morph b/strata/foundation/acl.morph
index 4489f5d5..c742d8ae 100644
--- a/strata/foundation/acl.morph
+++ b/strata/foundation/acl.morph
@@ -1,4 +1,6 @@
 name: acl
 kind: chunk
+build-commands:
+- make
 install-commands:
 - make DESTDIR="$DESTDIR" install-dev
diff --git a/strata/foundation/kmod.morph b/strata/foundation/kmod.morph
index 12ac8692..2f80dfc3 100644
--- a/strata/foundation/kmod.morph
+++ b/strata/foundation/kmod.morph
@@ -5,15 +5,23 @@ configure-commands:
 - sed -i -e'/SUBDIRS/{s/\S*doc\S*//;s/\S*man\S*//}' Makefile.am
 - sed -i -e'/AC_CONFIG_FILES(\[/,/])/{/docs/d}' configure.ac
 - autoreconf -fiv
-- ./configure --prefix=/usr --bindir=/bin --libdir=/lib --sysconfdir=/etc --without-xz
-  --with-zlib --disable-manpages
+- |
+  ./configure --prefix="$PREFIX" --bindir="$PREFIX"/bin \
+              --libdir="$PREFIX"/lib --sysconfdir=/etc \
+              --without-xz --with-zlib \
+              --disable-manpages --enable-python
 build-commands:
 - make
 install-commands:
-- make DESTDIR="$DESTDIR" pkgconfigdir=/usr/lib/pkgconfig install
-- ln -s kmod "$DESTDIR"/bin/modprobe
-- ln -s kmod "$DESTDIR"/bin/lsmod
-- ln -s kmod "$DESTDIR"/bin/rmmod
-- ln -s kmod "$DESTDIR"/bin/insmod
-- ln -s kmod "$DESTDIR"/bin/modinfo
-- ln -s kmod "$DESTDIR"/bin/depmod
+- make DESTDIR="$DESTDIR" pkgconfigdir="$PREFIX"/lib/pkgconfig install
+- |
+  if [ -h /sbin ]; then
+    for app in modprobe lsmod rmmod insmod modinfo depmod; do
+      ln -sf kmod "$DESTDIR$PREFIX/bin/$app"
+    done
+  else
+    install -d "$DESTDIR"/sbin
+    for app in modprobe lsmod rmmod insmod modinfo depmod; do
+      ln -sf ../"$PREFIX"/bin/kmod "$DESTDIR/sbin/$app"
+    done
+  fi
diff --git a/strata/foundation/rsync.morph b/strata/foundation/rsync.morph
index fb10f94e..54337412 100644
--- a/strata/foundation/rsync.morph
+++ b/strata/foundation/rsync.morph
@@ -6,4 +6,4 @@ build-commands:
 - make
 install-commands:
 - make install
-- install -D -m 755 packaging/systemd/rsync.service "$DESTDIR$PREFIX"/lib/systemd/system/rsync.service
+- install -D -m 644 packaging/systemd/rsync.service "$DESTDIR$PREFIX"/lib/systemd/system/rsync.service
diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph
index 81db9acd..c53cef39 100644
--- a/strata/foundation/systemd.morph
+++ b/strata/foundation/systemd.morph
@@ -3,9 +3,11 @@ kind: chunk
 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 \
+      --disable-tests --sysconfdir=/etc --localstatedir=/var \
+      --libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" \
+      --with-rootprefix= --with-rootlibdir=/lib
 install-commands:
 - make DESTDIR="$DESTDIR" install
 - mkdir -p "$DESTDIR"/sbin