[PATCH] Clean up module install rules

[PATCH] Clean up module install rules

[Brian Gerst]

[-- Attachment #1: Type: text/plain, Size: 85 bytes --]

Consolidate rules for installing internal and external modules.

--
				Brian Gerst


[-- Attachment #2: modinst-1 --]
[-- Type: text/plain, Size: 994 bytes --]

diff -urN linux-2.6.7-bk/scripts/Makefile.modinst linux/scripts/Makefile.modinst
--- linux-2.6.7-bk/scripts/Makefile.modinst	2004-06-23 18:06:06.000000000 -0400
+++ linux/scripts/Makefile.modinst	2004-06-29 13:45:26.232647680 -0400
@@ -16,20 +16,10 @@
 __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)
-
-$(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))