diff options
| author | Heinz Wiesinger <pprkut@liwjatan.at> | 2013-12-07 17:10:07 +0100 |
|---|---|---|
| committer | Erik Hanson <erik@slackbuilds.org> | 2013-12-14 10:52:35 -0600 |
| commit | 342a00436db770cbe5b8a6ab1270f544ce581337 (patch) | |
| tree | 65f42097e115ea8f0a4e5aede60cf85aef928b31 | |
| parent | cb0b8510e615ff355701fb6acdb52cdcaf04c284 (diff) | |
system/apache-tomcat: Fix location of tomcat-juli.jar.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
| -rw-r--r-- | system/apache-tomcat/apache-tomcat.SlackBuild | 5 | ||||
| -rw-r--r-- | system/apache-tomcat/rc.tomcat | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/system/apache-tomcat/apache-tomcat.SlackBuild b/system/apache-tomcat/apache-tomcat.SlackBuild index 137249cc30268..9c1545de36e31 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 diff --git a/system/apache-tomcat/rc.tomcat b/system/apache-tomcat/rc.tomcat index 97966a68cefc2..478528d1afca8 100644 --- a/system/apache-tomcat/rc.tomcat +++ b/system/apache-tomcat/rc.tomcat @@ -18,7 +18,8 @@ fi PIDFILE="/var/spool/tomcat/tomcat.pid" LOGFILE="/var/log/tomcat/tomcat.log" -CLASSPATH="$CATALINA_BASE/bin/bootstrap.jar:/usr/share/java/commons-daemon.jar" +CLASSPATH="$CATALINA_BASE/bin/bootstrap.jar:$CATALINA_BASE/bin/tomcat-juli.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/commons-daemon.jar" for i in $CATALINA_LIBDIR/*.jar; do CLASSPATH=$CLASSPATH:$i done |