vswitchd: Install vswitch.ovsschema to $(pkgdatadir).

This way, the xenserver spec file and the upcoming RHEL 5.6 spec file don't
have to install it by hand.

Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/Makefile.am b/Makefile.am
index ea6df2aaf431ea67d427b55ccf361893f76032b6..2a1bb3536886936ce2b5284276fb74e5cb10c671 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,6 +61,7 @@ noinst_man_MANS =
 noinst_PROGRAMS =
 noinst_SCRIPTS =
 OVSIDL_BUILT =
+pkgdata_DATA =
 scripts_SCRIPTS =
 SUFFIXES =
 check_DATA =

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index b8ee5b3b4a8bb73701c0885aadb5b0f28ec31708..1df5dff79da6ec9bc22541d38c6466ec77f23ad8 100644 (file)
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -42,6 +42,7 @@ OVSIDL_BUILT += \
        vswitchd/vswitch-idl.ovsidl
 VSWITCH_IDL_FILES = vswitchd/vswitch.ovsschema vswitchd/vswitch-idl.ann
 EXTRA_DIST += $(VSWITCH_IDL_FILES)
+pkgdata_DATA += vswitchd/vswitch.ovsschema
 vswitchd/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
        $(OVSDB_IDLC) -C $(srcdir) annotate $(VSWITCH_IDL_FILES) > $@.tmp
        mv $@.tmp $@

diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec
index 0eafc0147d65ac2554c7eb0f6630f1dac5825208..da9ed1f240d8d110dc73f149fb85e69e80bad40e 100644 (file)
--- a/xenserver/openvswitch-xen.spec
+++ b/xenserver/openvswitch-xen.spec
@@ -94,8 +94,6 @@ install -d -m 755 $RPM_BUILD_ROOT/etc/xensource/bugtool/system-configuration
 install -m 644 xenserver/etc_xensource_bugtool_system-configuration_openvswitch.xml \
          $RPM_BUILD_ROOT/etc/xensource/bugtool/system-configuration/openvswitch.xml
 install -d -m 755 $RPM_BUILD_ROOT/usr/share/openvswitch/scripts
-install -m 644 vswitchd/vswitch.ovsschema \
-         $RPM_BUILD_ROOT/usr/share/openvswitch/vswitch.ovsschema
 install -m 755 xenserver/opt_xensource_libexec_interface-reconfigure \
              $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/interface-reconfigure
 install -m 644 xenserver/opt_xensource_libexec_InterfaceReconfigure.py \