Author: bmahe
Date: Wed Oct 3 07:19:05 2012
New Revision: 1393324
URL: http://svn.apache.org/viewvc?rev=1393324&view=rev
Log:
BIGTOP-707. Make variables used in tomcat build/install scripts consistent
(Anatoli Fomenko via Bruno Mahé)
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-tomcat/install_tomcat.sh
incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/rules
incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-tomcat/install_tomcat.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-tomcat/install_tomcat.sh?rev=1393324&r1=1393323&r2=1393324&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-tomcat/install_tomcat.sh
(original)
+++
incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-tomcat/install_tomcat.sh
Wed Oct 3 07:19:05 2012
@@ -76,16 +76,15 @@ for var in PREFIX BUILD_DIR ; do
fi
done
-MAN_DIR=$PREFIX/usr/share/man/man1
-DOC_DIR=${DOC_DIR:-$PREFIX/usr/share/doc/bigtop-tomcat}
-LIB_DIR=${LIB_DIR:-$PREFIX/usr/lib/bigtop-tomcat}
+DOC_DIR=${DOC_DIR:-/usr/share/doc/bigtop-tomcat}
+LIB_DIR=${LIB_DIR:-/usr/lib/bigtop-tomcat}
# First we'll move everything into lib
-install -d -m 0755 $LIB_DIR
-(cd $BUILD_DIR && tar -cf - .) | (cd $LIB_DIR && tar -xf -)
+install -d -m 0755 $PREFIX/$LIB_DIR
+(cd $BUILD_DIR && tar -cf - .) | (cd $PREFIX/$LIB_DIR && tar -xf -)
-rm -rf $LIB_DIR/webapps
-mv -f $LIB_DIR/conf $LIB_DIR/conf.template
+rm -rf $PREFIX/$LIB_DIR/webapps
+mv -f $PREFIX/$LIB_DIR/conf $PREFIX/$LIB_DIR/conf.template
-install -d -m 0755 $DOC_DIR
-mv $LIB_DIR/{RUNNING.txt,RELEASE-NOTES,NOTICE,LICENSE} $DOC_DIR
+install -d -m 0755 $PREFIX/$DOC_DIR
+mv $PREFIX/$LIB_DIR/{RUNNING.txt,RELEASE-NOTES,NOTICE,LICENSE} $PREFIX/$DOC_DIR
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/rules?rev=1393324&r1=1393323&r2=1393324&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/rules
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/rules Wed Oct
3 07:19:05 2012
@@ -46,7 +46,7 @@ install-indep:
dh_testroot
bash -x debian/install_tomcat.sh \
--build-dir=build \
- --doc-dir=debian/bigtop-tomcat/usr/share/doc/bigtop-tomcat \
+ --doc-dir=/usr/share/doc/bigtop-tomcat \
--prefix=debian/bigtop-tomcat
(dh_lintian) || /bin/true
Modified:
incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec?rev=1393324&r1=1393323&r2=1393324&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec
(original)
+++
incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec
Wed Oct 3 07:19:05 2012
@@ -47,7 +47,7 @@ bash %{SOURCE1}
%__rm -rf $RPM_BUILD_ROOT
bash %{SOURCE2} \
--build-dir=build \
- --doc-dir=$RPM_BUILD_ROOT%{doc_tomcat} \
+ --doc-dir=%{doc_tomcat} \
--prefix=$RPM_BUILD_ROOT
%files
