You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jf...@apache.org on 2004/03/12 09:23:46 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.in
jfclere 2004/03/12 00:23:46
Modified: jk/native2/server/apache2 Makefile.in
Log:
PR 27006.
Revision Changes Path
1.23 +11 -4 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.in 10 Mar 2004 23:52:34 -0000 1.22
+++ Makefile.in 12 Mar 2004 08:23:46 -0000 1.23
@@ -103,10 +103,17 @@
jni-build: ${BUILD_DIR}/libjkjni.so
-${BUILD_DIR}/mod_jk2.so: ${BUILD_DIR}/mod_jk2.la
- $(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}
-${BUILD_DIR}/libjkjni.so: ${BUILD_DIR}/libjkjni.la
- $(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}
+${BUILD_DIR}/mod_jk2.so: ${BUILD_DIR}/${APACHE2_LIBEXEC}/mod_jk2.so
+ $(CP) $^ $@
+${BUILD_DIR}/${APACHE2_LIBEXEC}/mod_jk2.so: ${BUILD_DIR}/mod_jk2.la
+ mkdir -p ${BUILD_DIR}/${APACHE2_LIBEXEC}
+ $(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}/${APACHE2_LIBEXEC}
+
+${BUILD_DIR}/libjkjni.so: ${BUILD_DIR}/${APACHE2_LIBEXEC}/libjkjni.so
+ $(CP) $^ $@
+${BUILD_DIR}/${APACHE2_LIBEXEC}/libjkjni.so: ${BUILD_DIR}/libjkjni.la
+ mkdir -p ${BUILD_DIR}/${APACHE2_LIBEXEC}
+ $(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}/${APACHE2_LIBEXEC}
${BUILD_DIR}/libjkjni.la: ${JNI_LO_FILES} ${COMMON_LO_FILES}
$(MOD_LINK) -o $@ $(JK_LDFLAGS) $^
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org