From: Ben Pfaff Date: Fri, 17 Jun 2011 19:51:18 +0000 (-0700) Subject: vswitchd: Install vswitch.ovsschema to $(pkgdatadir). X-Git-Tag: v1.2.0~154 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9c16ed644efc7f36a073c45529353ffc0a1542a3;p=sliver-openvswitch.git 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 --- diff --git a/Makefile.am b/Makefile.am index ea6df2aaf..2a1bb3536 100644 --- 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 b8ee5b3b4..1df5dff79 100644 --- 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 0eafc0147..da9ed1f24 100644 --- 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 \