emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
fixup the merge of the time applet, which I messed up.
 -Erik
This commit is contained in:
Eric Andersen 2001-12-06 07:42:04 +00:00
parent 0ee0a8d539
commit 356b6dbf86
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/applets.h
View File

@ -437,7 +437,7 @@
#ifdef CONFIG_TFTP #ifdef CONFIG_TFTP
APPLET(tftp, tftp_main, _BB_DIR_USR_BIN) APPLET(tftp, tftp_main, _BB_DIR_USR_BIN)
#endif #endif
#ifdef BB_TIME #ifdef CONFIG_TIME
APPLET(time, time_main, _BB_DIR_USR_BIN) APPLET(time, time_main, _BB_DIR_USR_BIN)
#endif #endif
#ifdef CONFIG_TOUCH #ifdef CONFIG_TOUCH

4
include/usage.h
View File

@ -1704,8 +1704,8 @@
#define time_trivial_usage \ #define time_trivial_usage \
"[OPTION]... COMMAND [ARGS...]" "[OPTION]... COMMAND [ARGS...]"
#define time_full_usage \ #define time_full_usage \
"Runs the program COMMAND with arguments ARGS. When COMMAND finishes,\n" "Runs the program COMMAND with arguments ARGS. When COMMAND finishes,\n" \
"COMMAND's resource usage information is displayed\n\n" "COMMAND's resource usage information is displayed\n\n" \
"Options:\n" \ "Options:\n" \
"\t-v\tDisplays verbose resource usage information." "\t-v\tDisplays verbose resource usage information."

1
miscutils/Makefile
View File

@ -33,6 +33,7 @@ obj-$(CONFIG_MAKEDEVS) += makedevs.o
obj-$(CONFIG_MKTEMP) += mktemp.o obj-$(CONFIG_MKTEMP) += mktemp.o
obj-$(CONFIG_MT) += mt.o obj-$(CONFIG_MT) += mt.o
obj-$(CONFIG_READLINK) += readlink.o obj-$(CONFIG_READLINK) += readlink.o
obj-$(CONFIG_TIME) += time.o
obj-$(CONFIG_UPDATE) += update.o obj-$(CONFIG_UPDATE) += update.o
obj-$(CONFIG_WATCHDOG) += watchdog.o obj-$(CONFIG_WATCHDOG) += watchdog.o