diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-30 19:15:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-30 19:15:07 -0800 |
| commit | d8b8beb4ebf0c03fea5a988fca0fb483ffd0fdc4 (patch) | |
| tree | 958464f7f407dfb09a2d7fd9c1b93e57831fc439 /Makefile | |
| parent | 7dac59fd69923d06b77294d10b7a1be1ec84378b (diff) | |
| parent | 73d089cea3d113c5ea04018a5060aa22d044b2b4 (diff) | |
| download | history-d8b8beb4ebf0c03fea5a988fca0fb483ffd0fdc4.tar.gz | |
Merge bk://linux-sam.bkbits.net/kbuild
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Makefile b/Makefile index 0da15efc25a727..f1fa0a26293238 100644 --- a/Makefile +++ b/Makefile @@ -107,6 +107,16 @@ endif # ifeq ($(KBUILD_SRC),) # We process the rest of the Makefile if this is the final invocation of make ifeq ($(skip-makefile),) +# Make sure we're not wasting cpu-cycles doing locale handling, yet do make +# sure error messages appear in the user-desired language +ifdef LC_ALL + LANG := $(LC_ALL) + LC_ALL := +endif +LC_COLLATE := C +LC_CTYPE := C +export LANG LC_ALL LC_COLLATE LC_CTYPE + srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR)) TOPDIR := $(srctree) # FIXME - TOPDIR is obsolete, use srctree/objtree @@ -652,7 +662,7 @@ include/config/MARKER: include/linux/autoconf.h uts_len := 64 define filechk_version.h - if expr length "$(KERNELRELEASE)" \> $(uts_len) >/dev/null ; then \ + if ((`echo -n "$(KERNELRELEASE)" | wc -c ` > $(uts_len))); then \ echo '"$(KERNELRELEASE)" exceeds $(uts_len) characters' >&2; \ exit 1; \ fi; \ @@ -911,6 +921,7 @@ help: @echo ' dir/file.[ois] - Build specified target only' @echo ' rpm - Build a kernel as an RPM package' @echo ' tags/TAGS - Generate tags file for editors' + @echo ' cscope - Generate cscope index' @echo '' @echo 'Documentation targets:' @$(MAKE) -f $(srctree)/Documentation/DocBook/Makefile dochelp |