summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-02-03 17:20:14 +0100
committerSteven Rostedt <rostedt@goodmis.org>2010-02-03 17:45:25 +0100
commit3cebbb81c7e75321e25cc586d07a25a3d98278fc (patch)
treeb2cb83e5fd4cb1aea374ca606f8b512a457b2138 /scripts
parentkconfig: Add LSMOD=file to override the lsmod for localmodconfig (diff)
downloadlinux-3cebbb81c7e75321e25cc586d07a25a3d98278fc.tar.xz
linux-3cebbb81c7e75321e25cc586d07a25a3d98278fc.zip
kconfig: Simplify LSMOD= handling
Signed-off-by: Michal Marek <mmarek@suse.cz> LKML-Reference: <20100203162014.GA10956@sepie.suse.cz> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 85b906547845..186c46604d06 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