From 06c3e49f017c22f456e43e0a34925d17db7fbc7f Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Sun, 15 Feb 2015 23:01:50 +0000
Subject: nfs-utils: usrmerge

---
 strata/nfs/nfs-utils.morph | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/strata/nfs/nfs-utils.morph b/strata/nfs/nfs-utils.morph
index c412e1d0..4bcb0f42 100644
--- a/strata/nfs/nfs-utils.morph
+++ b/strata/nfs/nfs-utils.morph
@@ -6,7 +6,12 @@ configure-commands:
 - ./configure --prefix="$PREFIX" --disable-nfsv4 --disable-nfsv41 --disable-gss --with-rpcgen=internal --without-tcp-wrappers
 install-commands:
 - make DESTDIR="$DESTDIR" install
-- mkdir -p "$DESTDIR"/lib/systemd/system
-- install -m644 proc-fs-nfsd.mount "$DESTDIR"/lib/systemd/system
-- install -m644 nfs-mountd.service "$DESTDIR"/lib/systemd/system
-- install -m644 nfs-server.service "$DESTDIR"/lib/systemd/system
+- mkdir -p "$DESTDIR$PREFIX"/lib/systemd/system
+- install -m644 proc-fs-nfsd.mount "$DESTDIR$PREFIX"/lib/systemd/system
+- install -m644 nfs-mountd.service "$DESTDIR$PREFIX"/lib/systemd/system
+- install -m644 nfs-server.service "$DESTDIR$PREFIX"/lib/systemd/system
+post-install-commands:
+- |
+  mkdir -p "$DESTDIR$PREFIX"/bin
+  mv "$DESTDIR"/sbin "$DESTDIR$PREFIX"/bin
+  rm -r "$DESTDIR"/sbin
-- 
cgit v1.2.1