[Lunar-commits] <moonbase> Revert "bash: move to /usr/bin"

[Zbigniew Luszpinski]

commit 1b3068e95caa2b60f7ec9beeebe6c166523e9631
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Mon Apr 30 12:33:40 2012 +0200

    Revert "bash: move to /usr/bin"
    
    This reverts commit 341a118032ab5de3cb29604a5150f6abc8d368c9.
---
 shells/bash/BUILD |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/shells/bash/BUILD b/shells/bash/BUILD
index 5376966..1f63131 100644
--- a/shells/bash/BUILD
+++ b/shells/bash/BUILD
@@ -27,18 +27,16 @@
   patch_it $SOURCE24 0  &&
   patch_it $SOURCE25 0  &&
 
-  OPTS+=" --enable-readline             \
+  OPTS+=" --bindir=/bin                 \
+          --enable-readline             \
           --without-installed-readline  \
           --with-curses                 \
           --without-bash-malloc         \
           --disable-profiling"         &&
 
   default_build  &&
-
-  # legacy links to /bin
-  ln -sf /usr/bin/bash /bin/sh    &&
-  ln -sf /usr/bin/bash /bin/bash  &&
-  ln -f  /usr/bin/bash /bin/rbash &&
+  ln -sf bash /bin/sh  &&
+  ln -f /bin/bash /bin/rbash  &&
 
   rm -f /usr/share/man/man1/bash.1  &&
   rm -f /usr/share/man/man1/bashbug.1  &&