|
1 Patch origin: in-house |
|
2 Patch status: under investigation, submitted upstream |
|
3 |
|
4 https://issues.apache.org/bugzilla/show_bug.cgi?id=57060 |
|
5 |
|
6 --- native/common/Makefile.in 2012-05-09 13:08:26.000000000 +0000 |
|
7 +++ native/common/Makefile.in 2014-09-16 12:42:37.566279820 +0000 |
|
8 @@ -31,7 +31,7 @@ |
|
9 OEXT=.lo |
|
10 include list.mk |
|
11 |
|
12 -CFLAGS=@apache_include@ @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS} |
|
13 +CFLAGS=-I. @apache_include@ @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS} |
|
14 |
|
15 include @top_srcdir@/scripts/build/rules.mk |
|
16 |
|
17 --- native/apache-2.0/Makefile.in 2012-05-09 13:08:26.000000000 +0000 |
|
18 +++ native/apache-2.0/Makefile.in 2014-09-17 09:40:13.054602402 +0000 |
|
19 @@ -15,6 +15,9 @@ |
|
20 |
|
21 ## |
|
22 |
|
23 +srcdir=@srcdir@ |
|
24 +top_srcdir=@top_srcdir@ |
|
25 +top_builddir=@top_builddir@ |
|
26 APXS=@APXS@ |
|
27 CP=@CP@ |
|
28 APACHE_DIR=@APACHE_DIR@ |
|
29 @@ -36,20 +39,20 @@ |
|
30 include @APACHE_CONFIG_VARS@ |
|
31 |
|
32 # Local settings ( overriding/appending to Apache's ) |
|
33 -COMMON=../common |
|
34 -JK_INCL=-DUSE_APACHE_MD5 -I ${COMMON} |
|
35 +COMMON=common |
|
36 +JK_INCL=-DUSE_APACHE_MD5 -I${top_builddir}/${COMMON} -I ${top_srcdir}/${COMMON} |
|
37 CFLAGS=@apache_include@ @CFLAGS@ ${JK_INCL} ${APXSCPPFLAGS} ${APXSCFLAGS} ${EXTRA_CFLAGS} ${EXTRA_CPPFLAGS} |
|
38 |
|
39 |
|
40 # Implicit rules |
|
41 -include ../scripts/build/rules.mk |
|
42 +include @top_srcdir@/scripts/build/rules.mk |
|
43 |
|
44 OEXT=.lo |
|
45 |
|
46 all: Makefile @LIB_JK_TYPE@ |
|
47 install: @INSTALL_TYPE@ |
|
48 |
|
49 -Makefile: Makefile.in |
|
50 +Makefile: ${srcdir}/Makefile.in |
|
51 echo Regenerating Makefile |
|
52 ( cd ..; ./config.status ) |
|
53 |
|
54 @@ -74,11 +77,14 @@ |
|
55 #################### Dynamic .so file #################### |
|
56 # APXS will compile every file, this is derived from apxs |
|
57 |
|
58 +mod_jk.lo: ${srcdir}/mod_jk.c |
|
59 + ${LT_COMPILE} |
|
60 + |
|
61 mod_jk.la: mod_jk.lo $(APACHE_OBJECTS) |
|
62 $(LIBTOOL) --mode=link ${COMPILE} $(APXSLDFLAGS) -o $@ -module -rpath ${libexecdir} -avoid-version mod_jk.lo $(APACHE_OBJECTS) |
|
63 |
|
64 mod_jk.so: mod_jk.la |
|
65 - ../scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_jk.la `pwd` |
|
66 + @top_srcdir@/scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_jk.la `pwd` |
|
67 |
|
68 install_dynamic: |
|
69 @echo "" |