SOURCES: ApacheJServ-ac.patch - more fixes

[glen]

Author: glen                         Date: Fri Aug 19 17:46:11 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- more fixes

---- Files affected:
SOURCES:
   ApacheJServ-ac.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/ApacheJServ-ac.patch
diff -u SOURCES/ApacheJServ-ac.patch:1.3 SOURCES/ApacheJServ-ac.patch:1.4
--- SOURCES/ApacheJServ-ac.patch:1.3	Fri Aug 19 18:28:10 2005
+++ SOURCES/ApacheJServ-ac.patch	Fri Aug 19 19:46:06 2005
@@ -119,3 +119,34 @@
  jar_DATA=${ARCHIVE}
  
  # VT: NOTE: This is not going to be as bad as in ECS because the findstring
+--- ./conf/Makefile.am~	1999-10-26 01:47:22.000000000 +0300
++++ ./conf/Makefile.am	2005-08-19 20:08:50.000000000 +0300
+@@ -1,4 +1,3 @@
+-INSTALL=./save-install.sh
+ EXTRA_DIST = save-install.sh.in
+ sysconf_DATA  = jserv.conf jserv.properties zone.properties
+ 
+--- ./configure.in~	2005-08-19 19:55:38.000000000 +0300
++++ ./configure.in	2005-08-19 20:06:25.000000000 +0300
+@@ -296,7 +296,9 @@
+     AC_MSG_RESULT(${apache_include})
+    
+     AC_MSG_CHECKING(for Apache configuration directory)
+-    sysconfdir=`$APXS -q SYSCONFDIR`/jserv
++	if [ -z "$sysconfdir" ]; then
++		sysconfdir=`$APXS -q SYSCONFDIR`/jserv
++	fi
+     AC_MSG_RESULT(${sysconfdir})
+ 
+     AC_MSG_CHECKING(for Apache library directory)
+--- ./configure.in~	2005-08-19 20:22:34.000000000 +0300
++++ ./configure.in	2005-08-19 20:22:36.000000000 +0300
+@@ -509,7 +509,7 @@
+ SYSCONFDIR=`eval echo "${sysconfdir}"`
+ 
+ APACHE_DIR=${apache_dir}
+-JSERV_CLASSES=${LIBEXECDIR}/${PACKAGE}.jar
++JSERV_CLASSES=${datadir}/java/${PACKAGE}.jar
+ 
+ JSERV_CONF="${SYSCONFDIR}"
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/ApacheJServ-ac.patch?r1=1.3&r2=1.4&f=u