Author: rjung
Date: Sat Dec 20 16:43:31 2014
New Revision: 1647015
URL: http://svn.apache.org/r1647015
Log:
More fixes to out of tree build.
Modified:
tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in
tomcat/jk/trunk/native/apache-1.3/Makefile.in
tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in
tomcat/jk/trunk/native/apache-2.0/Makefile.in
Modified: tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in?rev=1647015&r1=1647014&r2=1647015&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in (original)
+++ tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in Sat Dec 20 16:43:31 2014
@@ -27,7 +27,7 @@ JK_INCL=-DUSE_APACHE_MD5 -I${top_builddi
## read the object (.c) from the list file.
OEXT=.c
-include @top_srcdir@/common/list.mk
+include @top_builddir@/common/list.mk
all: mod_jk.so
Modified: tomcat/jk/trunk/native/apache-1.3/Makefile.in
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/Makefile.in?rev=1647015&r1=1647014&r2=1647015&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/Makefile.in (original)
+++ tomcat/jk/trunk/native/apache-1.3/Makefile.in Sat Dec 20 16:43:31 2014
@@ -45,7 +45,8 @@ COMPILE = $(CC)
SH_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) $(JK_CFLAGS)
MOD_LINK = $(LIBTOOL) --mode=link $(CC) @APXSLDFLAGS@
-include @top_srcdir@/common/list.mk
+JK=${top_builddir}/common/
+include @top_builddir@/common/list.mk
all: @LIB_JK_TYPE@
Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in?rev=1647015&r1=1647014&r2=1647015&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in (original)
+++ tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in Sat Dec 20 16:43:31 2014
@@ -27,7 +27,7 @@ JK_INCL=-DUSE_APACHE_MD5 -I${top_builddi
## read the object (.c) from the list file.
OEXT=.c
-include @top_srcdir@/common/list.mk
+include @top_builddir@/common/list.mk
all: mod_jk.la
Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.in
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.in?rev=1647015&r1=1647014&r2=1647015&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/Makefile.in (original)
+++ tomcat/jk/trunk/native/apache-2.0/Makefile.in Sat Dec 20 16:43:31 2014
@@ -32,7 +32,7 @@ libexecdir=${APACHE_DIR}/modules
JK=../common/
# Defines APACHE_OBJECTS - the list of all common files
-include ../common/list.mk
+include @top_builddir/common/list.mk
# Apache2 settings, values guessed by Apache config and used to build it
# Will define libexecdir, LIBTOOL, etc
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
