From 17b69f15152059f8a777ed40dedc9d224e31ba61 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 16 Sep 2018 06:15:37 -0600 Subject: [PATCH] Directory.mk: If the current directory contains a Kconfig file and MENUDESC is not defined, then Directory.mk must not trash the Kconfig in the current directory. --- Directory.mk | 2 ++ graphics/NxWidgets/UnitTests/Kconfig | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Directory.mk b/Directory.mk index 1c01f9167..65c5d5b0d 100644 --- a/Directory.mk +++ b/Directory.mk @@ -60,7 +60,9 @@ nothing: install: preconfig: $(foreach SDIR, $(SUBDIRS), $(SDIR)_preconfig) +ifneq ($(MENUDESC),) $(Q) $(MKKCONFIG) -m $(MENUDESC) +endif context: $(foreach SDIR, $(SUBDIRS), $(SDIR)_context) diff --git a/graphics/NxWidgets/UnitTests/Kconfig b/graphics/NxWidgets/UnitTests/Kconfig index 3ed4fe165..8d160feeb 100644 --- a/graphics/NxWidgets/UnitTests/Kconfig +++ b/graphics/NxWidgets/UnitTests/Kconfig @@ -97,7 +97,7 @@ config NXWIDGETS_UNITTEST_CTEXTBOX config NXWIDGETS_UNITTEST_NXWM tristate "NxWM" - default n + default y depends on NXWM endmenu # Unit Tests