diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2010-04-12 06:18:10 -0700 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2010-04-12 06:18:10 -0700 |
| commit | 6cc4f58c6382c850ce97f32f56d1a3ff00ca4585 (patch) | |
| tree | 19a2f25da5db93c2cb620c0da3c38d3bffd0b784 /extra | |
| parent | c58dd2b2aabda615aa333cdbb023defbf00b30a3 (diff) | |
| parent | e90c33f951efc032ca23f48326343a83c0b54b10 (diff) | |
Merge remote branch 'origin/master' into nptl
Conflicts:
libc/unistd/confstr.c
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/config/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/config/Makefile b/extra/config/Makefile index ce406adc2..800f750d3 100644 --- a/extra/config/Makefile +++ b/extra/config/Makefile @@ -73,7 +73,7 @@ $(obj)/%:: $(top_srcdir)$(src)/%_shipped @$(disp_gen) $(Q)cat $< > $@ endif -menuconfig_clean: +CLEAN_extra/config menuconfig_clean: $(do_rm) $(clean-files) $(lxdialog) conf $(wildcard *.o) distclean: clean $(do_rm) $(lxdialog) $(conf-objs) $(mconf-objs) \ |