Major rework of the directory structure and the entire build system.
-Erik
diff --git a/applets/busybox.c b/applets/busybox.c
index 33efb5d..e6e5eca 100644
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -5,14 +5,14 @@
#include <errno.h>
#include <stdlib.h>
#include "busybox.h"
-#ifdef BB_LOCALE_SUPPORT
+#ifdef CONFIG_LOCALE_SUPPORT
#include <locale.h>
#endif
int been_there_done_that = 0; /* Also used in applets.c */
const char *applet_name;
-#ifdef BB_FEATURE_INSTALLER
+#ifdef CONFIG_FEATURE_INSTALLER
/*
* directory table
* this should be consistent w/ the enum, busybox.h::Location,
@@ -63,7 +63,7 @@
}
}
-#endif /* BB_FEATURE_INSTALLER */
+#endif /* CONFIG_FEATURE_INSTALLER */
int main(int argc, char **argv)
{
@@ -79,8 +79,8 @@
applet_name = s;
}
-#ifdef BB_LOCALE_SUPPORT
-#ifdef BB_INIT
+#ifdef CONFIG_LOCALE_SUPPORT
+#ifdef CONFIG_INIT
if(getpid()!=1) /* Do not set locale for `init' */
#endif
{
@@ -97,7 +97,7 @@
{
int col = 0, len, i;
-#ifdef BB_FEATURE_INSTALLER
+#ifdef CONFIG_FEATURE_INSTALLER
/*
* This style of argument parsing doesn't scale well
* in the event that busybox starts wanting more --options.
@@ -125,7 +125,7 @@
}
return rc;
}
-#endif /* BB_FEATURE_INSTALLER */
+#endif /* CONFIG_FEATURE_INSTALLER */
argc--;