aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/kconfig/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-04 19:36:52 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-04 19:36:52 -0500
commit25c862cc9ea9b312c25a9f577f91b973131f1261 (patch)
tree8e8f56531144370ced50fa98db2973f4e93e38b0 /scripts/kconfig/Makefile
parent52347f4e810ba323d02cd2c26b5d738f4a2c3d5e (diff)
parent8ded4ac018ea706bf7ee926601a27184665c9c28 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'scripts/kconfig/Makefile')
-rw-r--r--scripts/kconfig/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index a96153fc793f..3d7f1ac9e00c 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -11,7 +11,7 @@ gconfig: $(obj)/gconf
11 $< arch/$(ARCH)/Kconfig 11 $< arch/$(ARCH)/Kconfig
12 12
13menuconfig: $(obj)/mconf 13menuconfig: $(obj)/mconf
14 $(Q)$(MAKE) $(build)=scripts/lxdialog 14 $(Q)$(MAKE) $(build)=scripts/kconfig/lxdialog
15 $< arch/$(ARCH)/Kconfig 15 $< arch/$(ARCH)/Kconfig
16 16
17config: $(obj)/conf 17config: $(obj)/conf
@@ -115,6 +115,7 @@ endif
115 115
116clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \ 116clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \
117 .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c 117 .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c
118subdir- += lxdialog
118 119
119# Needed for systems without gettext 120# Needed for systems without gettext
120KBUILD_HAVE_NLS := $(shell \ 121KBUILD_HAVE_NLS := $(shell \