diff options
| author | Sam Ravnborg <sam@mars.ravnborg.org> | 2005-03-12 10:49:12 +0100 |
|---|---|---|
| committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2005-03-12 10:49:12 +0100 |
| commit | 0e6affc5a27c00c2f740f149b6b491e268d2396c (patch) | |
| tree | cdc44a8fb35336e6655c824da4c94948e41b3820 /scripts/Makefile.modinst | |
| parent | 12dd2ea4409a7b2829641b5af9ec14f68295d718 (diff) | |
| parent | d605b1d3fef0abb0c76798101859b26e04e3e51a (diff) | |
Merge mars.ravnborg.org:/home/sam/bk/linux-2.6
into mars.ravnborg.org:/home/sam/bk/kbuild
Diffstat (limited to 'scripts/Makefile.modinst')
| -rw-r--r-- | scripts/Makefile.modinst | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst index ba47b7fcb140..85d6494e3c24 100644 --- a/scripts/Makefile.modinst +++ b/scripts/Makefile.modinst @@ -21,8 +21,9 @@ quiet_cmd_modules_install = INSTALL $@ # 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 = $(MODLIB)/$(if $(filter ../% /%,$@),$(INSTALL_MOD_DIR)/,kernel/$(@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)) |