From: Ben Pfaff <blp@nicira.com>
Date: Fri, 18 Dec 2009 00:06:20 +0000 (-0800)
Subject: debian: Tolerate varying locations of vswitch-idl.ovsschema.
X-Git-Tag: v1.0.0~259^2~366
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8943a2084e8d2cff6a21f2431f20ae8805adb961;p=sliver-openvswitch.git

debian: Tolerate varying locations of vswitch-idl.ovsschema.

The Debian packaging as well as the testsuite was picky about where
the ovsschema file appeared.  This should fix the problem.
---

diff --git a/debian/rules b/debian/rules
index 0d0abf164..99d1f09ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,6 +85,10 @@ install-arch: build-arch
 	$(MAKE) -C _debian DESTDIR=$(CURDIR)/debian/openvswitch install
 	cp debian/openvswitch-switch-config.overrides debian/openvswitch-switch-config/usr/share/lintian/overrides/openvswitch-switch-config
 	cp debian/openvswitch-switch.template debian/openvswitch-switch/usr/share/openvswitch/switch/default.template
+	@# If we are working from a "make dist" tarball then make sure that
+	@# the ovsschema file is available in the build directory.
+	test -e _debian/vswitchd/vswitch-idl.ovsschema || \
+		cp vswitchd/vswitch-idl.ovsschema _debian/vswitchd/vswitch-idl.ovsschema
 	dh_install -s
 	env TERMINFO=debian/openvswitch-switchui/usr/share/terminfo tic -x extras/ezio/ezio3.ti