From: Matt Kraai <kraai@debian.org>
Date: Thu, 9 Aug 2001 21:00:15 +0000 (-0000)
Subject: Remove BB_SH define entirely.
X-Git-Tag: 0_60_1~29
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d0b5be6da872097f46d66b21ec9557c264c7966a;p=oweals%2Fbusybox.git

Remove BB_SH define entirely.
---

diff --git a/Config.h b/Config.h
index b0b57b04e..1e9e5500c 100644
--- a/Config.h
+++ b/Config.h
@@ -462,15 +462,11 @@
 #endif
 //
 #if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH
-# define BB_SH
 # define shell_main ash_main
 #elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH
-# define BB_SH
 # define shell_main hush_main
 #elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH
-# define BB_SH
 # define shell_main lash_main
 #elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH
-# define BB_SH
 # define shell_main msh_main
 #endif
diff --git a/chroot.c b/chroot.c
index 0440e46b9..de6a2ea50 100644
--- a/chroot.c
+++ b/chroot.c
@@ -48,7 +48,7 @@ int chroot_main(int argc, char **argv)
 		prog = *argv;
 		execvp(*argv, argv);
 	} else {
-#if defined(BB_SH) && defined BB_FEATURE_SH_STANDALONE_SHELL
+#if defined shell_main && defined BB_FEATURE_SH_STANDALONE_SHELL
 		char shell[] = "/bin/sh";
 		char *shell_argv[2] = { shell, NULL };
 		applet_name = shell;
diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index 0440e46b9..de6a2ea50 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -48,7 +48,7 @@ int chroot_main(int argc, char **argv)
 		prog = *argv;
 		execvp(*argv, argv);
 	} else {
-#if defined(BB_SH) && defined BB_FEATURE_SH_STANDALONE_SHELL
+#if defined shell_main && defined BB_FEATURE_SH_STANDALONE_SHELL
 		char shell[] = "/bin/sh";
 		char *shell_argv[2] = { shell, NULL };
 		applet_name = shell;
diff --git a/debian/Config.h-deb b/debian/Config.h-deb
index 892ce1303..fd848e192 100644
--- a/debian/Config.h-deb
+++ b/debian/Config.h-deb
@@ -459,15 +459,11 @@
 #endif
 //
 #if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH
-# define BB_SH
 # define shell_main ash_main
 #elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH
-# define BB_SH
 # define shell_main hush_main
 #elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH
-# define BB_SH
 # define shell_main lash_main
 #elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH
-# define BB_SH
 # define shell_main msh_main
 #endif
diff --git a/debian/Config.h-static b/debian/Config.h-static
index 71f6df0d0..094b1f9b4 100644
--- a/debian/Config.h-static
+++ b/debian/Config.h-static
@@ -459,15 +459,11 @@
 #endif
 //
 #if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH
-# define BB_SH
 # define shell_main ash_main
 #elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH
-# define BB_SH
 # define shell_main hush_main
 #elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH
-# define BB_SH
 # define shell_main lash_main
 #elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH
-# define BB_SH
 # define shell_main msh_main
 #endif
diff --git a/debian/Config.h-udeb b/debian/Config.h-udeb
index 51446ff89..8e7594dc4 100644
--- a/debian/Config.h-udeb
+++ b/debian/Config.h-udeb
@@ -459,15 +459,11 @@
 #endif
 //
 #if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH
-# define BB_SH
 # define shell_main ash_main
 #elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH
-# define BB_SH
 # define shell_main hush_main
 #elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH
-# define BB_SH
 # define shell_main lash_main
 #elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH
-# define BB_SH
 # define shell_main msh_main
 #endif