utilities: Install ovs-save in scripts directory.

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/utilities/automake.mk b/utilities/automake.mk
index 7c82b73..69cc5d2 100644 (file)
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -12,7 +12,7 @@ bin_SCRIPTS += \
        utilities/ovs-vlan-test
 endif
 noinst_SCRIPTS += utilities/ovs-pki-cgi utilities/ovs-parse-leaks
-scripts_SCRIPTS += utilities/ovs-ctl utilities/ovs-lib.sh
+scripts_SCRIPTS += utilities/ovs-ctl utilities/ovs-lib.sh utilities/ovs-save
 
 EXTRA_DIST += \
        utilities/ovs-appctl.8.in \

diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec
index d6565b8..0eafc01 100644 (file)
--- a/xenserver/openvswitch-xen.spec
+++ b/xenserver/openvswitch-xen.spec
@@ -112,8 +112,6 @@ install -m 755 xenserver/usr_share_openvswitch_scripts_sysconfig.template \
          $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/sysconfig.template
 install -m 755 xenserver/usr_share_openvswitch_scripts_xen-bugtool-tc-class-show \
          $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/xen-bugtool-tc-class-show
-install -m 755 utilities/ovs-save \
-         $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovs-save
 install -d -m 755 $RPM_BUILD_ROOT/usr/lib/xsconsole/plugins-base
 install -m 644 \
         xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py \