debian: Fix bug from commit 211b05b5 "debian: Modernize use of dh_install."

Commit 211b05b5 "debian: Modernize use of dh_install" caused build failures
in clean environments because debian/ovsdbmonitor.install now installed
files that were never created in such an environment.  It didn't cause a
build failure in my own testing because I still had old files around.
This fixes the problem.

It seems to be necessary to run "make install" once for each of binary-arch
and binary-indep, because dh_prep always deletes debian/tmp.  It is
logically not necessary but I don't see a clean and robust way to avoid it.

diff --git a/debian/ovsdbmonitor.install b/debian/ovsdbmonitor.install
index c34900c2de9cf21945545e59667d7987ac129650..7e91e62d2d4d89bf60ac9c4dcc4dfed6839318e4 100644 (file)
--- a/debian/ovsdbmonitor.install
+++ b/debian/ovsdbmonitor.install
@@ -1,2 +1,2 @@
-debian/openvswitch/usr/bin/ovsdbmonitor usr/bin
-debian/openvswitch/usr/share/openvswitch usr/share
+usr/bin/ovsdbmonitor
+usr/share/openvswitch

diff --git a/debian/rules b/debian/rules
index 224f095af9e80d85083f1151eac6d9fd531ec267..37d321b7d183fb947470babece4abcf6c8b8d7a0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -74,6 +74,7 @@ install-indep: build-indep
        dh_testroot
        dh_prep -i
        dh_installdirs -i
+       $(MAKE) -C _debian DESTDIR=$(CURDIR)/debian/tmp install
        dh_install -i
        sed 's/^BUILD_NUMBER = .*/BUILD_NUMBER = $(BUILD_NUMBER)/' \
                < debian/rules.modules \