Remove BB_SH define entirely.

diff --git a/Config.h b/Config.h
index b0b57b04ede744a7cdc1ad024cfdc7c414b54837..1e9e5500ca7bb4507b6ed8d7ee5b1678dcf449fa 100644 (file)
--- 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 0440e46b987d5f560143779b382999eef36c028e..de6a2ea501a41383b6e06c3dbe8e1ff54d56b30c 100644 (file)
--- 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 0440e46b987d5f560143779b382999eef36c028e..de6a2ea501a41383b6e06c3dbe8e1ff54d56b30c 100644 (file)
--- 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 892ce1303fda7708157c9676f592976748f33837..fd848e1929191afdbda7c997fc0e8a7bb0643348 100644 (file)
--- 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 71f6df0d03ec666c4b1cc48786e029dddf9bd58c..094b1f9b4b61deead462da3c92293bc7fc04d6df 100644 (file)
--- 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 51446ff89c1c9b288ab758185d760da22c0c6f70..8e7594dc4871f71e6a31a247e255c6e52cae2213 100644 (file)
--- 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