From: Chris Wright <chrisw@sous-sol.org>
Date: Fri, 9 Dec 2011 07:36:04 +0000 (-0800)
Subject: utilities: install ovs-lib.sh as data not a script
X-Git-Tag: sliver-openvswitch-0.1-1~575
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=429ebf217bd72fc28de6816bbbfeaf9ce006ecd9;hp=186ef5c12d6d2fd15dca4f6a3067893c610f616d;p=sliver-openvswitch.git

utilities: install ovs-lib.sh as data not a script

Currently, ovs-lib.sh is installed as an executable.  It's meant to be
sourced by external scripts, so install as data.  Fixes rpmlint error:

 E: script-without-shebang /usr/share/openvswitch/scripts/ovs-lib.sh

Could drop the .sh suffix in another commit.

Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/Makefile.am b/Makefile.am
index 51441cee5..46de7fb33 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,6 +59,7 @@ dist_pkgdata_DATA =
 dist_pkgdata_SCRIPTS =
 dist_sbin_SCRIPTS =
 dist_scripts_SCRIPTS =
+dist_scripts_DATA =
 INSTALL_DATA_LOCAL =
 UNINSTALL_LOCAL =
 man_MANS =
@@ -74,6 +75,7 @@ OVSIDL_BUILT =
 pkgdata_DATA =
 sbin_SCRIPTS =
 scripts_SCRIPTS =
+scripts_DATA =
 SUFFIXES =
 check_DATA =
 
diff --git a/utilities/automake.mk b/utilities/automake.mk
index df94dd1e8..1c8a56b9e 100644
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -13,7 +13,8 @@ bin_SCRIPTS += \
 	utilities/ovs-vlan-test
 endif
 noinst_SCRIPTS += utilities/ovs-pki-cgi
-scripts_SCRIPTS += utilities/ovs-ctl utilities/ovs-lib.sh utilities/ovs-save
+scripts_SCRIPTS += utilities/ovs-ctl utilities/ovs-save
+scripts_DATA += utilities/ovs-lib.sh
 
 EXTRA_DIST += \
 	utilities/ovs-ctl.in \