From 8943a2084e8d2cff6a21f2431f20ae8805adb961 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 17 Dec 2009 16:06:20 -0800 Subject: [PATCH] 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. --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index 0d0abf16..99d1f09a 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 -- 2.30.2