[Linux-cluster] [PATCH] make kernel modules install path consistent

[Fabio Massimo Di Nitto <fabbione fabbione net>]

Hi guys,
    another little clean up patch.
As it is now the patch target and the install target end up storing the kernel modules
in 2 different directories. kernel/cluster/$projectname/ for the former and kernel/cluster/
for the latter.

The patch (against the STABLE branch from 2005-07-14) make the behaviour consistent installing the
modules in kernel/cluster/$projectname/

Please apply

Cheers
Fabio

-- 
no signature file found.

#! /bin/sh /usr/share/dpatch/dpatch-run
## kernel-modules-install-paths.dpatch by  <fabbione localhost localdomain>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad --exclude=CVS --exclude=.svn ./cman-kernel/src/Makefile /usr/src/dpatchtemp/dpep-work.VBlrPB/redhat-cluster-suite-1.20050714/cman-kernel/src/Makefile
--- ./cman-kernel/src/Makefile	2005-01-13 20:57:40.000000000 +0100
+++ /usr/src/dpatchtemp/dpep-work.VBlrPB/redhat-cluster-suite-1.20050714/cman-kernel/src/Makefile	2005-07-14 07:55:06.000000000 +0200
@@ -38,13 +38,13 @@
 	${MAKE} -C ${KERNEL_SRC} M=${PWD} modules USING_KBUILD=yes
 
 install: all
-	install -d ${module_dir}/cluster
-	install cman.ko ${module_dir}/cluster
+	install -d ${module_dir}/cluster/cman
+	install cman.ko ${module_dir}/cluster/cman
 	install -d ${incdir}/cluster
 	install cnxman.h cnxman-socket.h service.h ${incdir}/cluster
 
 uninstall:
-	${UNINSTALL} cman.ko ${module_dir}/cluster
+	${UNINSTALL} cman.ko ${module_dir}/cluster/cman
 	${UNINSTALL} cnxman.h cnxman-socket.h service.h ${incdir}/cluster
 
 
diff -urNad --exclude=CVS --exclude=.svn ./cmirror/src/Makefile /usr/src/dpatchtemp/dpep-work.VBlrPB/redhat-cluster-suite-1.20050714/cmirror/src/Makefile
--- ./cmirror/src/Makefile	2005-07-14 06:17:23.000000000 +0200
+++ /usr/src/dpatchtemp/dpep-work.VBlrPB/redhat-cluster-suite-1.20050714/cmirror/src/Makefile	2005-07-14 07:56:59.000000000 +0200
@@ -35,11 +35,11 @@
 	${MAKE} -C ${KERNEL_SRC} M=${PWD} modules USING_KBUILD=yes
 
 install: all
-	install -d ${module_dir}/cluster
-	install dm-cmirror.ko ${module_dir}/cluster
+	install -d ${module_dir}/cluster/cmirror
+	install dm-cmirror.ko ${module_dir}/cluster/cmirror
 
 uninstall:
-	${UNINSTALL} dm-cmirror.ko ${module_dir}/cluster
+	${UNINSTALL} dm-cmirror.ko ${module_dir}/cluster/cmirror
 
 clean:
 	rm -rf cluster cnxman* service.h *.ko *.o *.mod.c *~ .*o.cmd .tmp_versions
diff -urNad --exclude=CVS --exclude=.svn ./dlm-kernel/src/Makefile /usr/src/dpatchtemp/dpep-work.VBlrPB/redhat-cluster-suite-1.20050714/dlm-kernel/src/Makefile
--- ./dlm-kernel/src/Makefile	2004-11-10 16:57:19.000000000 +0100
+++ /usr/src/dpatchtemp/dpep-work.VBlrPB/redhat-cluster-suite-1.20050714/dlm-kernel/src/Makefile	2005-07-14 07:55:58.000000000 +0200
@@ -39,13 +39,13 @@
 	${MAKE} -C ${KERNEL_SRC} M=${PWD} modules USING_KBUILD=yes
 
 install: all
-	install -d ${module_dir}/cluster
-	install dlm.ko ${module_dir}/cluster
+	install -d ${module_dir}/cluster/dlm
+	install dlm.ko ${module_dir}/cluster/dlm
 	install -d ${incdir}/cluster
 	install dlm.h dlm_device.h ${incdir}/cluster
 
 uninstall:
-	${UNINSTALL} dlm.ko ${module_dir}/cluster
+	${UNINSTALL} dlm.ko ${module_dir}/cluster/dlm
 	${UNINSTALL} dlm.h dlm_device.h ${incdir}/cluster