From: Ben Pfaff <blp@nicira.com>
Date: Thu, 30 Oct 2008 17:24:36 +0000 (-0700)
Subject: Simplify debian/rules by adding new openflow-datapath-source.install file.
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=42992b04688b90fa001b637118a1929a298202df;p=sliver-openvswitch.git

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
index 000000000..6cda0413a
--- /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 d5f55c081..a03ff5030 100755
--- 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