summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2001-12-06 07:42:04 +0000
committerEric Andersen2001-12-06 07:42:04 +0000
commit356b6dbf8674cea50da27cd78a9c52fe2fcad9a0 (patch)
tree139eb2c9d6e7af6423a492d479f0036c7c31171c
parent0ee0a8d5396c9da17ba47991715da3ff8ea484f1 (diff)
downloadbusybox-356b6dbf8674cea50da27cd78a9c52fe2fcad9a0.zip
busybox-356b6dbf8674cea50da27cd78a9c52fe2fcad9a0.tar.gz
Patch from Steve Merrifield <steve@labyrinth.net.au> to
fixup the merge of the time applet, which I messed up. -Erik
-rw-r--r--include/applets.h2
-rw-r--r--include/usage.h4
-rw-r--r--miscutils/Makefile1
3 files changed, 4 insertions, 3 deletions
diff --git a/include/applets.h b/include/applets.h
index 0b90694..b543de1 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 a3447e8..14d1656 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 fec0e63..3a4d1b6 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