diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | busybox.def.h | 3 | ||||
| -rw-r--r-- | coreutils/uname.c | 5 | ||||
| -rw-r--r-- | uname.c | 5 |
4 files changed, 11 insertions, 8 deletions
@@ -96,7 +96,6 @@ ifdef BB_INIT_SCRIPT endif all: busybox busybox.links docs -.PHONY: all busybox: $(OBJECTS) $(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES) @@ -111,26 +110,21 @@ busybox.links: busybox.def.h regexp.o nfsmount.o: %.o: %.h $(OBJECTS): %.o: busybox.def.h internal.h %.c -.PHONY: test tests test tests: cd tests && $(MAKE) all -.PHONY: clean clean: - rm -f busybox.links *~ *.o core - rm -rf _install - cd tests && $(MAKE) clean -.PHONY: distclean distclean: clean - rm -f busybox - cd tests && $(MAKE) distclean -.PHONY: install install: busybox busybox.links ./install.sh $(PREFIX) -.PHONY: dist release dist release: distclean $(MAKE) -C docs clean all cd ..; \ diff --git a/busybox.def.h b/busybox.def.h index 1880884f9..79eef1d12 100644 --- a/busybox.def.h +++ b/busybox.def.h @@ -130,6 +130,9 @@ // normal strings. #define BB_FEATURE_FULL_REGULAR_EXPRESSIONS // +// Use only simple command help +#define BB_FEATURE_TRIVIAL_HELP +// // Use termios to manipulate the screen ('more' is prettier with this on) #define BB_FEATURE_USE_TERMIOS // diff --git a/coreutils/uname.c b/coreutils/uname.c index 9a1cb808a..f1304925d 100644 --- a/coreutils/uname.c +++ b/coreutils/uname.c @@ -43,6 +43,7 @@ static const char uname_usage[] = "uname [OPTION]...\n\n" +#ifndef BB_FEATURE_TRIVIAL_HELP "Print certain system information. With no OPTION, same as -s.\n\n" "Options:\n" "\t-a\tprint all information\n" @@ -52,7 +53,9 @@ static const char uname_usage[] = "\t-s\tprint the operating system name\n" "\t-p\tprint the host processor type\n" - "\t-v\tprint the operating system version\n"; + "\t-v\tprint the operating system version\n" +#endif + ; static void print_element(unsigned int mask, char *element); @@ -43,6 +43,7 @@ static const char uname_usage[] = "uname [OPTION]...\n\n" +#ifndef BB_FEATURE_TRIVIAL_HELP "Print certain system information. With no OPTION, same as -s.\n\n" "Options:\n" "\t-a\tprint all information\n" @@ -52,7 +53,9 @@ static const char uname_usage[] = "\t-s\tprint the operating system name\n" "\t-p\tprint the host processor type\n" - "\t-v\tprint the operating system version\n"; + "\t-v\tprint the operating system version\n" +#endif + ; static void print_element(unsigned int mask, char *element); |