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/11 19:09:33 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 Makefile.in
jfclere 2004/03/11 10:09:33
Modified: jk/native2/server/apache13 Makefile.in
Log:
libtool 1.5.2 checks the location where the library is installed, that is
to make it happy.
That fixes PR 27006 with apache13.
Revision Changes Path
1.14 +6 -2 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.in 20 Feb 2004 03:04:42 -0000 1.13
+++ Makefile.in 11 Mar 2004 18:09:33 -0000 1.14
@@ -81,8 +81,12 @@
all: prepare ${BUILD_DIR}/mod_jk2.so
-${BUILD_DIR}/mod_jk2.so: ${BUILD_DIR}/mod_jk2.la
- $(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}
+${BUILD_DIR}/mod_jk2.so: ${BUILD_DIR}/$(APACHE_LIBEXEC)/mod_jk2.so
+ $(CP) $^ $@
+
+${BUILD_DIR}/$(APACHE_LIBEXEC)/mod_jk2.so: ${BUILD_DIR}/mod_jk2.la
+ mkdir -p ${BUILD_DIR}$(APACHE_LIBEXEC)
+ $(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}/$(APACHE_LIBEXEC)
${BUILD_DIR}/mod_jk2.la: ${COMMON_LO_FILES} ${A_LO_FILES}
${MOD_LINK} -o $@ $^ ${APR_LDFLAGS}
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
Re: cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13
Makefile.in
Posted by jean-frederic clere <jf...@fujitsu-siemens.com>.
jfclere@apache.org wrote:
> jfclere 2004/03/11 10:09:33
>
> Modified: jk/native2/server/apache13 Makefile.in
> Log:
> libtool 1.5.2 checks the location where the library is installed, that is
> to make it happy.
> That fixes PR 27006 with apache13.
Oops the PR 27006 concerns mod_jk2 and Apache-2.0.
I will arrange it later.
>
> Revision Changes Path
> 1.14 +6 -2 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.13
> retrieving revision 1.14
> diff -u -r1.13 -r1.14
> --- Makefile.in 20 Feb 2004 03:04:42 -0000 1.13
> +++ Makefile.in 11 Mar 2004 18:09:33 -0000 1.14
> @@ -81,8 +81,12 @@
>
> all: prepare ${BUILD_DIR}/mod_jk2.so
>
> -${BUILD_DIR}/mod_jk2.so: ${BUILD_DIR}/mod_jk2.la
> - $(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}
> +${BUILD_DIR}/mod_jk2.so: ${BUILD_DIR}/$(APACHE_LIBEXEC)/mod_jk2.so
> + $(CP) $^ $@
> +
> +${BUILD_DIR}/$(APACHE_LIBEXEC)/mod_jk2.so: ${BUILD_DIR}/mod_jk2.la
> + mkdir -p ${BUILD_DIR}$(APACHE_LIBEXEC)
> + $(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}/$(APACHE_LIBEXEC)
>
> ${BUILD_DIR}/mod_jk2.la: ${COMMON_LO_FILES} ${A_LO_FILES}
> ${MOD_LINK} -o $@ $^ ${APR_LDFLAGS}
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
>
>