summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-02-15 23:38:56 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-02-15 23:38:56 (GMT)
commit41e9a603f8652bd0dcb89704fd8b910b1fb5851a (patch)
treebc4d0ed84e2d8bbdffa16b26742fb2eecdf21e92
parent386c99aaae26339d418d657a08dbe62c10738f22 (diff)
downloaddefinitions-baserock/pedroalvarez/usr-merge.tar.gz
-rw-r--r--strata/foundation/kmod.morph14
1 files changed, 7 insertions, 7 deletions
diff --git a/strata/foundation/kmod.morph b/strata/foundation/kmod.morph
index 12ac869..c782492 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