truk 2004/02/09 20:24:13
Modified: jk/native2/server/apache13 Makefile.in
jk/native2/server/apache2 Makefile.in
Log:
JAVA_HOME is always defined now. Adjust conditional.
Revision Changes Path
1.12 +1 -1 jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in
Index: Makefile.in
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in 6 Feb 2004 14:07:18 -0000 1.11
+++ Makefile.in 10 Feb 2004 04:24:13 -0000 1.12
@@ -10,7 +10,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-ifdef JAVA_HOME
+ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} @HAVE_JNI@
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
endif
1.18 +1 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile.in 9 Feb 2004 09:20:28 -0000 1.17
+++ Makefile.in 10 Feb 2004 04:24:13 -0000 1.18
@@ -14,7 +14,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-ifdef JAVA_HOME
+ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
