From 8798937c164ed3ebc4fff49596fc446e9da5e335 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Sun, 15 Feb 2015 16:01:28 +0000
Subject: fixup-stage2-fhs

---
 strata/build-essential/stage2-fhs-dirs.morph | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/strata/build-essential/stage2-fhs-dirs.morph b/strata/build-essential/stage2-fhs-dirs.morph
index ba0beb22..1b4fdbe1 100644
--- a/strata/build-essential/stage2-fhs-dirs.morph
+++ b/strata/build-essential/stage2-fhs-dirs.morph
@@ -3,15 +3,13 @@ kind: chunk
 description: create the FHS 2.3 directory hierarchy and the usual files
 install-commands:
 - sh ./create-fhs-dirs "$DESTDIR"
-- rmdir "$DESTDIR/usr/bin"
 - rmdir "$DESTDIR/bin"
 - rmdir "$DESTDIR/sbin"
 - rm -r  "$DESTDIR"/lib
-- ln -s usr/bin "$DESTDIR"/bin
 - ln -s usr/sbin "$DESTDIR"/sbin
 - ln -s usr/lib "$DESTDIR"/lib
 - ln -s usr/lib64 "$DESTDIR"/lib64
-- ln -s "$PREFIX/bin" "$DESTDIR/usr/bin"
+- ln -s "$PREFIX/bin" "$DESTDIR/bin"
 - install -m 644 passwd "$DESTDIR/etc/passwd"
 - install -m 600 shadow "$DESTDIR/etc/shadow"
 - install -m 644 interfaces "$DESTDIR/etc/network/interfaces"
-- 
cgit v1.2.1