git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
scripts
/
Makefile.modinst
diff --git
a/scripts/Makefile.modinst
b/scripts/Makefile.modinst
index
5431acb
..
b9ab77d
100644
(file)
--- a/
scripts/Makefile.modinst
+++ b/
scripts/Makefile.modinst
@@
-9,27
+9,17
@@
include scripts/Makefile.lib
#
#
-__modules := $(s
hell head -q -n1 /dev/null $(wildcard $(MODVERDIR)/*.mod
))
+__modules := $(s
ort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)
))
modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o)))
.PHONY: $(modules)
__modinst: $(modules)
@:
modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o)))
.PHONY: $(modules)
__modinst: $(modules)
@:
-# Modules built within the kernel tree
-
quiet_cmd_modules_install = INSTALL $@
quiet_cmd_modules_install = INSTALL $@
- cmd_modules_install = mkdir -p $(MODLIB)/kernel/$(@D); \
- cp $@ $(MODLIB)/kernel/$(@D)
-
-$(filter-out ../% /%,$(modules)):
- $(call cmd,modules_install)
-
-# Modules built outside just go into extra
+ cmd_modules_install = mkdir -p $(2); cp $@ $(2)
-quiet_cmd_modules_install_extra = INSTALL $(obj-m:.o=.ko)
- cmd_modules_install_extra = mkdir -p $(MODLIB)/extra; \
- cp $@ $(MODLIB)/extra
+modinst_dir = $(MODLIB)/$(if $(filter ../% /%,$@),extra/,kernel/$(@D))
-$(
filter ../% /%,$(modules)
):
- $(call cmd,modules_install
_extra
)
+$(
modules
):
+ $(call cmd,modules_install
,$(modinst_dir)
)