X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=debian%2Frules.modules;h=2eb944055c27089d3aeed926a6e535f706f5f4ce;hb=HEAD;hp=4f39ceed7767eedecbad43d1c5935dc8f3e76db5;hpb=a84edf5408291651f21d519df206ea6182b92dfc;p=sliver-openvswitch.git

diff --git a/debian/rules.modules b/debian/rules.modules
index 4f39ceed7..2eb944055 100755
--- a/debian/rules.modules
+++ b/debian/rules.modules
@@ -7,9 +7,6 @@ MA_DIR ?= /usr/share/modass
 
 DATAPATH_CONFIGURE_OPTS =
 
-# Official build number.  Leave set to 0 if not an official build.
-BUILD_NUMBER = 0
-
 kdist_clean:
 	dh_testdir	
 	dh_testroot
@@ -20,16 +17,17 @@ kdist_clean:
 kdist_config: prep-deb-files
 
 .PHONY: binary-modules
-binary-modules: DSTDIR = $(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)
+binary-modules: DSTDIR = $(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/kernel
 binary-modules: prep-deb-files
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	tar xzf openvswitch.tar.gz
-	cd openvswitch && ./configure --with-l26=$(KSRC) $(DATAPATH_CONFIGURE_OPTS) --with-build-number=$(BUILD_NUMBER)
-	cd openvswitch && $(MAKE) -C datapath/linux-2.6
+	cd openvswitch && ./configure --with-linux=$(KSRC) $(DATAPATH_CONFIGURE_OPTS)
+	cd openvswitch && $(MAKE) -C datapath/linux
 	install -d -m755 $(DSTDIR)
-	install -m644 openvswitch/datapath/linux-2.6/*_mod.ko $(DSTDIR)/
+	install -m644 openvswitch/datapath/linux/*.ko $(DSTDIR)/
+	dh_installmodules
 	dh_installdocs
 	dh_installchangelogs
 	dh_compress