Patch from Steve Merrifield <steve@labyrinth.net.au> to

fixup the merge of the time applet, which I messed up.
 -Erik

3 files changed, 4 insertions, 3 deletions

diff --git a/include/applets.h b/include/applets.h
index 0b9069497..b543de1bc 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -437,7 +437,7 @@
 #ifdef CONFIG_TFTP
         APPLET(tftp, tftp_main, _BB_DIR_USR_BIN)
 #endif
-#ifdef BB_TIME
+#ifdef CONFIG_TIME
         APPLET(time, time_main, _BB_DIR_USR_BIN)
 #endif
 #ifdef CONFIG_TOUCH
diff --git a/include/usage.h b/include/usage.h
index a3447e83a..14d16561f 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -1704,8 +1704,8 @@
 #define time_trivial_usage \
         "[OPTION]... COMMAND [ARGS...]"
 #define time_full_usage \
-        "Runs the program COMMAND with arguments ARGS.  When COMMAND finishes,\n"
-        "COMMAND's resource usage information is displayed\n\n"
+        "Runs the program COMMAND with arguments ARGS.  When COMMAND finishes,\n" \
+        "COMMAND's resource usage information is displayed\n\n" \
         "Options:\n" \
         "\t-v\tDisplays verbose resource usage information."
 
diff --git a/miscutils/Makefile b/miscutils/Makefile
index fec0e63cb..3a4d1b659 100644
--- a/miscutils/Makefile
+++ b/miscutils/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_MAKEDEVS)		+= makedevs.o
 obj-$(CONFIG_MKTEMP)            += mktemp.o
 obj-$(CONFIG_MT)                += mt.o
 obj-$(CONFIG_READLINK)          += readlink.o
+obj-$(CONFIG_TIME)              += time.o
 obj-$(CONFIG_UPDATE)            += update.o
 obj-$(CONFIG_WATCHDOG)          += watchdog.o