File tree 1 file changed +8
-1
lines changed
1 file changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -9,6 +9,13 @@ RAKE=rake -j $(NUM_THREADS)
9
9
NGX_MRUBY_ROOT =$(shell pwd)
10
10
NGX_SRC_ROOT =@NGX_SRC_ROOT@
11
11
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
+
12
19
MRUBY_ROOT =@MRUBY_ROOT@
13
20
NDK_ROOT =@NDK_ROOT@
14
21
@@ -57,7 +64,7 @@ make_ngx_mruby:
57
64
cd $(NGX_SRC_ROOT ) && $(MAKE )
58
65
59
66
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 )
61
68
62
69
# create mrbgems config
63
70
generate_gems_config :
You can’t perform that action at this time.
0 commit comments