From 41e9a603f8652bd0dcb89704fd8b910b1fb5851a Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Sun, 15 Feb 2015 23:38:56 +0000
Subject: usrmerge kmod

---
 strata/foundation/kmod.morph | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/strata/foundation/kmod.morph b/strata/foundation/kmod.morph
index 12ac8692..c782492c 100644
--- a/strata/foundation/kmod.morph
+++ b/strata/foundation/kmod.morph
@@ -5,15 +5,15 @@ 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
+- ./configure --prefix=/usr --bindir="$PREFIX/bin" --libdir=/lib --sysconfdir=/etc --without-xz
   --with-zlib --disable-manpages
 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
+- ln -s kmod "$DESTDIR$PREFIX"/bin/modprobe
+- ln -s kmod "$DESTDIR$PREFIX"/bin/lsmod
+- ln -s kmod "$DESTDIR$PREFIX"/bin/rmmod
+- ln -s kmod "$DESTDIR$PREFIX"/bin/insmod
+- ln -s kmod "$DESTDIR$PREFIX"/bin/modinfo
+- ln -s kmod "$DESTDIR$PREFIX"/bin/depmod
-- 
cgit v1.2.1