This has been merged into my for-next branch:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig.git
for-linus-2
Michal Marek (1):
kconfig: Simplify LSMOD= handling
----
scripts/kconfig/Makefile | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
---------------------------
commit 3cebbb81c7e75321e25cc586d07a25a3d98278fc
Author: Michal Marek <mmarek@xxxxxxx>
Date: Wed Feb 3 17:20:14 2010 +0100
kconfig: Simplify LSMOD= handling
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
LKML-Reference: <20100203162014.GA10956@xxxxxxxxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 85b9065..186c466 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -32,11 +32,10 @@ silentoldconfig: $(obj)/conf
# if no path is given, then use src directory to find file
ifdef LSMOD
-LSMOD_F = $(shell if [ `basename $(LSMOD)` == $(LSMOD) ]; then \
- echo $(objtree)/$(LSMOD); \
- else \
- echo $(LSMOD); \
- fi)
+LSMOD_F := $(LSMOD)
+ifeq ($(findstring /,$(LSMOD)),)
+ LSMOD_F := $(objtree)/$(LSMOD)
+endif
endif
localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
