From: Ben Pfaff <blp@nicira.com>
Date: Fri, 31 Oct 2008 19:11:31 +0000 (-0700)
Subject: Fix openflow-datapath-source bugs added in "Simplify debian/rules..." commit.
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2e424547ff0f44b9e7451f46a494827dc53346f0;p=sliver-openvswitch.git

Fix openflow-datapath-source bugs added in "Simplify debian/rules..." commit.
---

diff --git a/debian/openflow-datapath-source.install b/debian/openflow-datapath-source.install
index 6cda0413a..a74f13dc2 100644
--- a/debian/openflow-datapath-source.install
+++ b/debian/openflow-datapath-source.install
@@ -1,6 +1,6 @@
-debian/changelog usr/src/modules/openflow-datapath
-debian/control usr/src/modules/openflow-datapath
-debian/compat usr/src/modules/openflow-datapath
-debian/*.modules.in usr/src/modules/openflow-datapath
-debian/rules usr/src/modules/openflow-datapath
+debian/changelog usr/src/modules/openflow-datapath/debian
+debian/control usr/src/modules/openflow-datapath/debian
+debian/compat usr/src/modules/openflow-datapath/debian
+debian/*.modules.in usr/src/modules/openflow-datapath/debian
+debian/rules usr/src/modules/openflow-datapath/debian
 _debian/openflow.tar.gz usr/src/modules/openflow-datapath
diff --git a/debian/rules b/debian/rules
index da957ce38..cfcfbdb3f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,9 +106,9 @@ install-indep: build-indep
 	dh_testroot
 	dh_clean -k -i 
 	dh_installdirs -i
+	dh_install -i
 	cd debian/openflow-datapath-source/usr/src && tar -c modules | bzip2 -9 > openflow-datapath.tar.bz2 && rm -rf modules
 	install -m644 debian/openflow-pki-server.apache2 debian/openflow-pki-server/etc/apache2/sites-available/openflow-pki
-	dh_install -i
 	$(ext_install_indep)
 
 install-arch: build-arch