Simplify debian/rules by adding new openflow-datapath-source.install file.

diff --git a/debian/openflow-datapath-source.install b/debian/openflow-datapath-source.install
new file mode 100644 (file)
index 0000000..6cda041
--- /dev/null
+++ b/debian/openflow-datapath-source.install
@@ -0,0 +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/openflow.tar.gz usr/src/modules/openflow-datapath

diff --git a/debian/rules b/debian/rules
index d5f55c0815077104ffc6526c069a7ab30bd125dc..a03ff5030f0513d73310d8ca99cc86a4e3c20bf7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -95,14 +95,11 @@ binary-modules: prep-deb-files
        dh_builddeb --destdir=$(DEB_DESTDIR)
 
 install: install-indep install-arch
-install-indep: MODDIR = $(CURDIR)/debian/openflow-datapath-source/usr/src/modules/openflow-datapath
 install-indep: build-indep
        dh_testdir
        dh_testroot
        dh_clean -k -i 
        dh_installdirs -i
-       cp _debian/openflow.tar.gz $(MODDIR)
-       cd debian; cp changelog control compat *.modules.in rules $(MODDIR)/debian
        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