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

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

diff --git a/include/applets.h b/include/applets.h
index 0b9069497132b5ff9ea19b624a24c7fe311c2db5..b543de1bcd688820baa0d2c2eadc955207f734f0 100644 (file)
--- 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 a3447e83a15fc461e32984a451cb9804b522a63f..14d16561fd58bac6a4f406906d3567b1209a2ce4 100644 (file)
--- 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 fec0e63cb81c7f82aa28b937b1dbdc0b043c0338..3a4d1b659627828bef1429ed5e71e34f79d4bfe8 100644 (file)
--- 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