Finish remerging busybox udhcp and udhcp. Some cleanups as well.

1 files changed, 10 insertions, 10 deletions

diff --git a/networking/udhcp/libbb_udhcp.h b/networking/udhcp/libbb_udhcp.h
index 73e2146..9b5d5a8 100644
--- a/networking/udhcp/libbb_udhcp.h
+++ b/networking/udhcp/libbb_udhcp.h
@@ -1,5 +1,13 @@
 /* libbb_udhcp.h - busybox compatability wrapper */
 
+/* bit of a hack, do this no matter what the order of the includes.
+ * (for busybox) */
+
+#ifdef CONFIG_INSTALL_NO_USR
+#undef DEFUALT_SCRIPT
+#define DEFAULT_SCRIPT  "/share/udhcpc/default.script"
+#endif
+
 #ifndef _LIBBB_UDHCP_H
 #define _LIBBB_UDHCP_H
 
@@ -7,22 +15,16 @@
 #include "busybox.h"
 
 #ifdef CONFIG_FEATURE_UDHCP_SYSLOG
-#define SYSLOG
+#define UDHCP_SYSLOG
 #endif
 
 #ifdef CONFIG_FEATURE_UDHCP_DEBUG
-#define DEBUG
+#define UDHCP_DEBUG
 #endif
 
 #define COMBINED_BINARY
 #include "version.h"
 
-#ifdef CONFIG_INSTALL_NO_USR
-#define DEFAULT_SCRIPT  "/share/udhcpc/default.script"
-#else
-#define DEFAULT_SCRIPT  "/usr/share/udhcpc/default.script"
-#endif
-
 #define xfopen bb_xfopen
 
 #else /* ! BB_VER */
@@ -36,8 +38,6 @@
 #define xmalloc malloc
 #define xcalloc calloc
 
-#define DEFAULT_SCRIPT  "/usr/share/udhcpc/default.script"
-
 static inline FILE *xfopen(const char *file, const char *mode)
 {
 	FILE *fp;