From 342a00436db770cbe5b8a6ab1270f544ce581337 Mon Sep 17 00:00:00 2001 From: Heinz Wiesinger Date: Sat, 7 Dec 2013 17:10:07 +0100 Subject: system/apache-tomcat: Fix location of tomcat-juli.jar. Signed-off-by: Matteo Bernardini --- system/apache-tomcat/apache-tomcat.SlackBuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'system/apache-tomcat/apache-tomcat.SlackBuild') diff --git a/system/apache-tomcat/apache-tomcat.SlackBuild b/system/apache-tomcat/apache-tomcat.SlackBuild index 137249cc30..9c1545de36 100644 --- a/system/apache-tomcat/apache-tomcat.SlackBuild +++ b/system/apache-tomcat/apache-tomcat.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=apache-tomcat VERSION=7.0.47 ARCH=noarch -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -68,14 +68,13 @@ mkdir -p $PKG/etc/tomcat $PKG/usr/share/{tomcat,java} \ rm -f bin/*.exe bin/*.bat bin/*.tar.gz bin/commons-daemon.jar cp -rf bin lib $PKG/usr/share/tomcat/ -mv $PKG/usr/share/tomcat/bin/tomcat-juli.jar \ - $PKG/usr/share/tomcat/lib/ cp -f conf/* $PKG/etc/tomcat/ cp -f $CWD/tomcat-java.conf $PKG/etc/tomcat/tomcat-java.conf cp -rf webapps ${PKG}${TOMCAT_HOME}/webapps +ln -s /usr/share/tomcat/bin ${PKG}${TOMCAT_HOME}/bin ln -s /var/log/tomcat ${PKG}${TOMCAT_HOME}/logs ln -s /var/tmp/tomcat ${PKG}${TOMCAT_HOME}/temp ln -s /var/run/tomcat ${PKG}${TOMCAT_HOME}/work -- cgit v1.2.3