Skip to content

Commit 5503f99

Browse files
committed
support development version of nginx. It does not contain configure in top of directory.
1 parent 3b64199 commit 5503f99

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

Makefile.in

+8-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ RAKE=rake -j $(NUM_THREADS)
99
NGX_MRUBY_ROOT=$(shell pwd)
1010
NGX_SRC_ROOT=@NGX_SRC_ROOT@
1111
NGX_CONFIG_OPT=@NGX_CONFIG_OPT@
12+
ifeq ($(wildcard $(NGX_SRC_ROOT)/auto/configure),)
13+
NGX_CONFIGURE = ./configure
14+
else
15+
# development branch does not have configure script in top of directory.
16+
NGX_CONFIGURE = ./auto/configure
17+
endif
18+
1219
MRUBY_ROOT=@MRUBY_ROOT@
1320
NDK_ROOT=@NDK_ROOT@
1421

@@ -57,7 +64,7 @@ make_ngx_mruby:
5764
cd $(NGX_SRC_ROOT) && $(MAKE)
5865

5966
ngx_mruby: generate_gems_config
60-
cd $(NGX_SRC_ROOT) && ./configure --add-module=$(NGX_MRUBY_ROOT) --add-module=$(NDK_ROOT) $(NGX_CONFIG_OPT) && $(MAKE)
67+
cd $(NGX_SRC_ROOT) && $(NGX_CONFIGURE) --add-module=$(NGX_MRUBY_ROOT) --add-module=$(NDK_ROOT) $(NGX_CONFIG_OPT) && $(MAKE)
6168

6269
# create mrbgems config
6370
generate_gems_config:

0 commit comments

Comments
 (0)