summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-03 09:52:41 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-03 09:52:41 (GMT)
commit51f0df26af5eeb2ee0911c20a43a1d8422b8f202 (patch)
tree4f57593e7435f9edf7e799439148055fb343515f
parent37e590dae843e78dc2bdd16b67b1a2d01699daf0 (diff)
downloaddefinitions-baserock/pedroalvarez/usr-merge2.tar.gz
-rw-r--r--strata/foundation/acl.morph14
1 files changed, 14 insertions, 0 deletions
diff --git a/strata/foundation/acl.morph b/strata/foundation/acl.morph
index 4489f5d..7f300b0 100644
--- a/strata/foundation/acl.morph
+++ b/strata/foundation/acl.morph
@@ -2,3 +2,17 @@ name: acl
kind: chunk
install-commands:
- make DESTDIR="$DESTDIR" install-dev
+post-install-commands:
+- |
+ if test -e "$DESTDIR/lib"; then
+ mkdir -p "$DESTDIR"/usr/lib
+ mv "$DESTDIR"/lib/* "$DESTDIR"/usr/lib/
+ rm -r "$DESTDIR/lib"
+ fi
+ if test -e "$DESTDIR/lib64"; then
+ mkdir -p "$DESTDIR"/usr/lib64
+ mv "$DESTDIR"/lib64/* "$DESTDIR"/usr/lib64/
+ rm -r "$DESTDIR/lib64"
+ fi
+
+- exit 1