You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2012/09/21 07:20:41 UTC
svn commit: r1388327 - in /incubator/bigtop/trunk/bigtop-packages/src:
common/bigtop-jsvc/install_jsvc.sh rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec
Author: cos
Date: Fri Sep 21 05:20:41 2012
New Revision: 1388327
URL: http://svn.apache.org/viewvc?rev=1388327&view=rev
Log:
BIGTOP-703. Make variables used in jsvc build/install scripts consistent ((Anatoli Fomenko via cos)
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-jsvc/install_jsvc.sh
incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-jsvc/install_jsvc.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-jsvc/install_jsvc.sh?rev=1388327&r1=1388326&r2=1388327&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-jsvc/install_jsvc.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-jsvc/install_jsvc.sh Fri Sep 21 05:20:41 2012
@@ -31,7 +31,8 @@ OPTS=$(getopt \
-o '' \
-l 'prefix:' \
-l 'build-dir:' \
- -l 'lib-dir:' \
+ -l 'man-dir:' \
+ -l 'bin-dir:' \
-l 'doc-dir:' \
-- "$@")
@@ -48,8 +49,11 @@ while true ; do
--build-dir)
BUILD_DIR=$2 ; shift 2
;;
- --lib-dir)
- LIB_DIR=$2 ; shift 2
+ --man-dir)
+ MAN_DIR=$2 ; shift 2
+ ;;
+ --bin-dir)
+ BIN_DIR=$2 ; shift 2
;;
--doc-dir)
DOC_DIR=$2 ; shift 2
@@ -72,12 +76,12 @@ for var in PREFIX BUILD_DIR; do
fi
done
-LIB_DIR=${LIB_DIR:-/usr/lib/bigtop-utils}
+BIN_DIR=${BIN_DIR:-/usr/lib/bigtop-utils}
DOC_DIR=${DOC_DIR:-/usr/share/doc/bigtop-jsvc}
#libexec
-install -d -m 0755 ${PREFIX}/${LIB_DIR}
-cp ${BUILD_DIR}/jsvc ${PREFIX}/${LIB_DIR}
+install -d -m 0755 ${PREFIX}/${BIN_DIR}
+cp ${BUILD_DIR}/jsvc ${PREFIX}/${BIN_DIR}
# docs
install -d -m 0755 ${PREFIX}/${DOC_DIR}
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec?rev=1388327&r1=1388326&r2=1388327&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec Fri Sep 21 05:20:41 2012
@@ -51,10 +51,10 @@ bash %{SOURCE1}
%install
%__rm -rf $RPM_BUILD_ROOT
sh %{SOURCE2} \
- --build-dir=. \
- --bin-dir=$RPM_BUILD_ROOT/%{bin_jsvc} \
- --doc-dir=$RPM_BUILD_ROOT/%{doc_jsvc} \
- --man-dir=$RPM_BUILD_ROOT/%{man_dir} \
+ --build-dir=. \
+ --bin-dir=%{bin_jsvc} \
+ --doc-dir=%{doc_jsvc} \
+ --man-dir=%{man_dir} \
--prefix=$RPM_BUILD_ROOT
%files