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 6cda0413afe134d8461d3ba07421b5e1c14d777c..a74f13dc2802a4da72238b05f04b1b87c068841b 100644 (file)
--- 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 da957ce388cf6daf010e6f3733d58ebfc00e41aa..cfcfbdb3f98274928a6f9a01cf704f0078744a2d 100755 (executable)
--- 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