From 46bf7de5f69aa1875ac7cb725cda005f437b2c87 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Thu, 2 Aug 2001 08:48:03 +0000 Subject: Ok, if no shell is enabled, don't include any of the SH_IS_ options or the build will fail -Erik --- applets.h | 8 ++++---- include/applets.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/applets.h b/applets.h index 184bce0..a26a06e 100644 --- a/applets.h +++ b/applets.h @@ -356,13 +356,13 @@ #ifdef BB_SETKEYCODES APPLET(setkeycodes, setkeycodes_main, _BB_DIR_USR_BIN) #endif -#ifdef BB_FEATURE_SH_IS_ASH +#if defined(BB_FEATURE_SH_IS_ASH) && defined(BB_ASH) APPLET_NOUSAGE("sh", ash_main, _BB_DIR_BIN) -#elif defined(BB_FEATURE_SH_IS_HUSH) +#elif defined(BB_FEATURE_SH_IS_HUSH) && defined(BB_HUSH) APPLET_NOUSAGE("sh", hush_main, _BB_DIR_BIN) -#elif defined(BB_FEATURE_SH_IS_LASH) +#elif defined(BB_FEATURE_SH_IS_LASH) && defined(BB_LASH) APPLET_NOUSAGE("sh", lash_main, _BB_DIR_BIN) -#elif defined(BB_FEATURE_SH_IS_MSH) +#elif defined(BB_FEATURE_SH_IS_MSH) && defined(BB_MSH) APPLET_NOUSAGE("sh", msh_main, _BB_DIR_BIN) #endif #ifdef BB_SLEEP diff --git a/include/applets.h b/include/applets.h index 184bce0..a26a06e 100644 --- a/include/applets.h +++ b/include/applets.h @@ -356,13 +356,13 @@ #ifdef BB_SETKEYCODES APPLET(setkeycodes, setkeycodes_main, _BB_DIR_USR_BIN) #endif -#ifdef BB_FEATURE_SH_IS_ASH +#if defined(BB_FEATURE_SH_IS_ASH) && defined(BB_ASH) APPLET_NOUSAGE("sh", ash_main, _BB_DIR_BIN) -#elif defined(BB_FEATURE_SH_IS_HUSH) +#elif defined(BB_FEATURE_SH_IS_HUSH) && defined(BB_HUSH) APPLET_NOUSAGE("sh", hush_main, _BB_DIR_BIN) -#elif defined(BB_FEATURE_SH_IS_LASH) +#elif defined(BB_FEATURE_SH_IS_LASH) && defined(BB_LASH) APPLET_NOUSAGE("sh", lash_main, _BB_DIR_BIN) -#elif defined(BB_FEATURE_SH_IS_MSH) +#elif defined(BB_FEATURE_SH_IS_MSH) && defined(BB_MSH) APPLET_NOUSAGE("sh", msh_main, _BB_DIR_BIN) #endif #ifdef BB_SLEEP -- cgit v1.1