# Installing modules
# ==========================================================================
-.PHONY: __modinst
+PHONY := __modinst
__modinst:
-include scripts/Makefile.lib
+include scripts/Kbuild.include
#
-__modules := $(shell head -q -n1 /dev/null $(wildcard $(MODVERDIR)/*.mod))
+__modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o)))
-.PHONY: $(modules)
+PHONY += $(modules)
__modinst: $(modules)
@:
-# Modules built within the kernel tree
-
quiet_cmd_modules_install = INSTALL $@
- cmd_modules_install = mkdir -p $(MODLIB)/kernel/$(@D); \
- cp $@ $(MODLIB)/kernel/$(@D)
+ cmd_modules_install = mkdir -p $(2); cp $@ $(2) ; $(mod_strip_cmd) $(2)/$(notdir $@)
+
+# 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))
-$(filter-out ../% /%,$(modules)):
- $(call cmd,modules_install)
+$(modules):
+ $(call cmd,modules_install,$(MODLIB)/$(modinst_dir))
-# Modules built outside just go into extra
-quiet_cmd_modules_install_extra = INSTALL $(obj-m:.o=.ko)
- cmd_modules_install_extra = mkdir -p $(MODLIB)/extra; \
- cp $@ $(MODLIB)/extra
+# Declare the contents of the .PHONY variable as phony. We keep that
+# information in a variable se we can use it in if_changed and friends.
-$(filter ../% /%,$(modules)):
- $(call cmd,modules_install_extra)
+.PHONY: $(PHONY)