From 3d7a187f7690d3d42f59f933f5d4aa32c096b7b4 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Mon, 27 Dec 2004 21:46:32 +0000
Subject: If both bash and busybox are selected, make certain bash wins the
 fight over who gets to own the /bin/sh symlink  -Erik

---
 package/bash/bash.mk | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'package/bash/bash.mk')

diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index 704b45b73..64f40d7be 100644
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -63,7 +63,13 @@ $(TARGET_DIR)/$(BASH_TARGET_BINARY): $(BASH_DIR)/$(BASH_BINARY)
 	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
 		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 
+#If both bash and busybox are selected, make certain bash wins
+#the fight over who gets to own the /bin/sh symlink
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+bash: ncurses uclibc busybox $(TARGET_DIR)/$(BASH_TARGET_BINARY)
+else
 bash: ncurses uclibc $(TARGET_DIR)/$(BASH_TARGET_BINARY)
+endif
 
 bash-clean:
 	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) uninstall
-- 
cgit v1.2.3