technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Changed modules names format.

Browse Source
This commit is contained in:
Igor Sysoev
2017-08-31 00:42:16 +03:00
parent f0e9e3ace9
commit 738ca54ded
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
auto/modules/php
View File

@@ -118,7 +118,7 @@ if grep ^$NXT_PHP_MODULE: $NXT_MAKEFILE 2>&1 > /dev/null; then
exit 1; exit 1;
fi fi
$echo " + PHP module: unit.${NXT_PHP_MODULE}" $echo " + PHP module: ${NXT_PHP_MODULE}.unit.so"
$echo >> $NXT_MAKEFILE $echo >> $NXT_MAKEFILE
@@ -152,10 +152,10 @@ cat << END >> $NXT_MAKEFILE
all: ${NXT_PHP_MODULE} all: ${NXT_PHP_MODULE}
${NXT_PHP_MODULE}: $NXT_BUILD_DIR/unit.${NXT_PHP_MODULE} ${NXT_PHP_MODULE}: $NXT_BUILD_DIR/${NXT_PHP_MODULE}.unit.so
$NXT_BUILD_DIR/unit.${NXT_PHP_MODULE}: $nxt_objs $NXT_BUILD_DIR/${NXT_PHP_MODULE}.unit.so: $nxt_objs
$NXT_MODULE_LINK -o $NXT_BUILD_DIR/unit.${NXT_PHP_MODULE} \\ $NXT_MODULE_LINK -o $NXT_BUILD_DIR/${NXT_PHP_MODULE}.unit.so \\
$nxt_objs ${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS} $nxt_objs ${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}
END END

8
auto/modules/python
View File

@@ -115,7 +115,7 @@ if grep ^$NXT_PYTHON_MODULE: $NXT_MAKEFILE 2>&1 > /dev/null; then
exit 1; exit 1;
fi fi
$echo " + Python module: unit.${NXT_PYTHON_MODULE}" $echo " + Python module: ${NXT_PYTHON_MODULE}.unit.so"
$echo >> $NXT_MAKEFILE $echo >> $NXT_MAKEFILE
@@ -149,10 +149,10 @@ cat << END >> $NXT_MAKEFILE
all: ${NXT_PYTHON_MODULE} all: ${NXT_PYTHON_MODULE}
${NXT_PYTHON_MODULE}: $NXT_BUILD_DIR/unit.${NXT_PYTHON_MODULE} ${NXT_PYTHON_MODULE}: $NXT_BUILD_DIR/${NXT_PYTHON_MODULE}.unit.so
$NXT_BUILD_DIR/unit.${NXT_PYTHON_MODULE}: $nxt_objs $NXT_BUILD_DIR/${NXT_PYTHON_MODULE}.unit.so: $nxt_objs
$NXT_MODULE_LINK -o $NXT_BUILD_DIR/unit.${NXT_PYTHON_MODULE} \\ $NXT_MODULE_LINK -o $NXT_BUILD_DIR/${NXT_PYTHON_MODULE}.unit.so \\
$nxt_objs $NXT_PYTHON_LIBS $nxt_objs $NXT_PYTHON_LIBS
END END

2
src/nxt_runtime.c
View File

@@ -763,7 +763,7 @@ nxt_runtime_conf_init(nxt_task_t *task, nxt_runtime_t *rt)
slash = "/"; slash = "/";
} }
ret = nxt_file_name_create(rt->mem_pool, &file_name, "%s%sunit.*%Z", ret = nxt_file_name_create(rt->mem_pool, &file_name, "%s%s*.unit.so%Z",
rt->modules, slash); rt->modules, slash);
if (nxt_slow_path(ret != NXT_OK)) { if (nxt_slow_path(ret != NXT_OK)) {
return NXT_ERROR; return NXT_ERROR;