You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by bm...@apache.org on 2012/09/18 06:46:17 UTC
svn commit: r1386982 -
/incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-jsvc/install_jsvc.sh
Author: bmahe
Date: Tue Sep 18 04:46:17 2012
New Revision: 1386982
URL: http://svn.apache.org/viewvc?rev=1386982&view=rev
Log:
BIGTOP-703. Make variables used in jsvc build/install scripts consistent (Anatoli Fomenko via Bruno Mahé)
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-jsvc/install_jsvc.sh
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=1386982&r1=1386981&r2=1386982&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 Tue Sep 18 04:46:17 2012
@@ -31,9 +31,8 @@ OPTS=$(getopt \
-o '' \
-l 'prefix:' \
-l 'build-dir:' \
- -l 'bin-dir:' \
+ -l 'lib-dir:' \
-l 'doc-dir:' \
- -l 'man-dir:' \
-- "$@")
if [ $? != 0 ] ; then
@@ -49,11 +48,8 @@ while true ; do
--build-dir)
BUILD_DIR=$2 ; shift 2
;;
- --bin-dir)
- BIN_DIR=$2 ; shift 2
- ;;
- --man-dir)
- MAN_DIR=$2 ; shift 2
+ --lib-dir)
+ LIB_DIR=$2 ; shift 2
;;
--doc-dir)
DOC_DIR=$2 ; shift 2
@@ -76,15 +72,14 @@ for var in PREFIX BUILD_DIR; do
fi
done
-BIN_DIR=${BIN_DIR:-$PREFIX/usr/lib/bigtop-utils}
-DOC_DIR=${DOC_DIR:-$PREFIX/usr/share/doc/bigtop-jsvc}
-MAN_DIR=${MAN_DIR:-$PREFIX/usr/man}
+LIB_DIR=${LIB_DIR:-/usr/lib/bigtop-utils}
+DOC_DIR=${DOC_DIR:-/usr/share/doc/bigtop-jsvc}
#libexec
-install -d -m 0755 ${BIN_DIR}
-cp ${BUILD_DIR}/jsvc ${BIN_DIR}
+install -d -m 0755 ${PREFIX}/${LIB_DIR}
+cp ${BUILD_DIR}/jsvc ${PREFIX}/${LIB_DIR}
# docs
-install -d -m 0755 ${DOC_DIR}
-cp ${BUILD_DIR}/*.txt ${DOC_DIR}/
-cp ${BUILD_DIR}/README ${DOC_DIR}/
+install -d -m 0755 ${PREFIX}/${DOC_DIR}
+cp ${BUILD_DIR}/*.txt ${PREFIX}/${DOC_DIR}/
+cp ${BUILD_DIR}/README ${PREFIX}/${DOC_DIR}/