From 19e8f6a15ad479ffa59e5f1cfe8ac850a4c5f52d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 12 Mar 2007 18:59:31 +0000 Subject: Auto-detect Darwin (MacOS-X) and disable libintl for during build for this platform. A bit of help tweaking. diff --git a/Makefile b/Makefile index c167840..3a0269d 100644 --- a/Makefile +++ b/Makefile @@ -21,9 +21,9 @@ include $(CT_TOP_DIR)/kconfig/Makefile help:: @echo 'Build targets:' - @echo '* build - Build the toolchain' - @echo ' clean - Remove generated files' - @echo ' distclean - Remove generated files and configuration' + @echo '* build - Build the toolchain' + @echo ' clean - Remove generated files' + @echo ' distclean - Remove generated files and configuration' include $(CT_TOP_DIR)/tools/Makefile diff --git a/kconfig/Makefile b/kconfig/Makefile index fa8f77a..39a2840 100644 --- a/kconfig/Makefile +++ b/kconfig/Makefile @@ -7,6 +7,11 @@ obj = ./kconfig PHONY += clean help oldconfig menuconfig config silentoldconfig \ randconfig allyesconfig allnoconfig allmodconfig defconfig +# Darwin (MacOS-X) does not have proper libintl support +ifeq ($(shell uname -s),Darwin) +KBUILD_NO_NLS:=1 +endif + ifneq ($(KBUILD_NO_NLS),) CFLAGS += -DKBUILD_NO_NLS endif @@ -31,9 +36,9 @@ $(SAMPLES_CONFIG): # Help text used by make help help:: @echo 'General purpose configuration targets:' - @echo ' config - Update current config using a line-oriented program' - @echo ' menuconfig - Update current config using a menu based program' - @echo ' oldconfig - Update current config using a provided .config as base' + @echo ' config - Update current config using a line-oriented program' + @echo ' menuconfig - Update current config using a menu based program' + @echo ' oldconfig - Update current config using a provided .config as base' @echo @echo 'Preconfigured configuration targets:' @for s in $(SAMPLES_CONFIG); do \ diff --git a/tools/Makefile b/tools/Makefile index c62796e..992792f 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -8,4 +8,4 @@ updatetools: @wget "$(CONFIG_GUESS_SRC)" -O "$(CONFIG_GUESS_DEST)" help:: - @echo ' updatetools - Update the config tools' + @echo ' updatetools - Update the config tools' -- cgit v0.10.2-6-g49f6