linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / scripts / Makefile.modinst

diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index b9ab77d..23fd1bd 100644 (file)
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
@@ -5,7 +5,7 @@
 .PHONY: __modinst
 __modinst:
 
-include scripts/Makefile.lib
+include scripts/Kbuild.include
 
 #
 
@@ -19,7 +19,11 @@ __modinst: $(modules)
 quiet_cmd_modules_install = INSTALL $@
       cmd_modules_install = mkdir -p $(2); cp $@ $(2)
 
-modinst_dir = $(MODLIB)/$(if $(filter ../% /%,$@),extra/,kernel/$(@D))
+# Modules built outside the kernel source tree go into extra by default
+INSTALL_MOD_DIR ?= extra
+ext-mod-dir = $(INSTALL_MOD_DIR)$(subst $(KBUILD_EXTMOD),,$(@D))
+
+modinst_dir = $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D))
 
 $(modules):
-       $(call cmd,modules_install,$(modinst_dir))
+       $(call cmd,modules_install,$(MODLIB)/$(modinst_dir))