From 0df48f27de1ea1ffcf9d7408c2ab7e16d3c31095 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 24 Feb 2015 18:29:24 +0000 Subject: linux-pam: usrmerge --- strata/foundation/linux-pam.morph | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/strata/foundation/linux-pam.morph b/strata/foundation/linux-pam.morph index 0dfbe759..c8d6e40f 100644 --- a/strata/foundation/linux-pam.morph +++ b/strata/foundation/linux-pam.morph @@ -3,6 +3,8 @@ kind: chunk build-system: autotools pre-configure-commands: - autoreconf -ivf +install-commands: +- make DESTDIR="$DESTDIR" install sbindir="$PREFIX/sbin" post-install-commands: # sudo command is expecting this file. - | @@ -13,3 +15,14 @@ post-install-commands: password required pam_unix.so session required pam_unix.so EOF +- | + 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 -- cgit v1.2.1