diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2017-08-31 00:42:16 +0300 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2017-08-31 00:42:16 +0300 |
| commit | 738ca54ded5493456de8bc65bef61059a65c8413 (patch) | |
| tree | d4bfcee990592b7883737ca376cfb7545cd8bcbe | |
| parent | f0e9e3ace94c82fab78ab1d4ee8c3042f3e94fdf (diff) | |
| download | unit-738ca54ded5493456de8bc65bef61059a65c8413.tar.gz unit-738ca54ded5493456de8bc65bef61059a65c8413.tar.bz2 | |
Changed modules names format.
| -rw-r--r-- | auto/modules/php | 8 | ||||
| -rw-r--r-- | auto/modules/python | 8 | ||||
| -rw-r--r-- | src/nxt_runtime.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/auto/modules/php b/auto/modules/php index a941b658..c8da3fe9 100644 --- a/auto/modules/php +++ b/auto/modules/php @@ -118,7 +118,7 @@ if grep ^$NXT_PHP_MODULE: $NXT_MAKEFILE 2>&1 > /dev/null; then exit 1; fi -$echo " + PHP module: unit.${NXT_PHP_MODULE}" +$echo " + PHP module: ${NXT_PHP_MODULE}.unit.so" $echo >> $NXT_MAKEFILE @@ -152,10 +152,10 @@ cat << END >> $NXT_MAKEFILE 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_MODULE_LINK -o $NXT_BUILD_DIR/unit.${NXT_PHP_MODULE} \\ +$NXT_BUILD_DIR/${NXT_PHP_MODULE}.unit.so: $nxt_objs + $NXT_MODULE_LINK -o $NXT_BUILD_DIR/${NXT_PHP_MODULE}.unit.so \\ $nxt_objs ${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS} END diff --git a/auto/modules/python b/auto/modules/python index 1034be82..ba272999 100644 --- a/auto/modules/python +++ b/auto/modules/python @@ -115,7 +115,7 @@ if grep ^$NXT_PYTHON_MODULE: $NXT_MAKEFILE 2>&1 > /dev/null; then exit 1; fi -$echo " + Python module: unit.${NXT_PYTHON_MODULE}" +$echo " + Python module: ${NXT_PYTHON_MODULE}.unit.so" $echo >> $NXT_MAKEFILE @@ -149,10 +149,10 @@ cat << END >> $NXT_MAKEFILE 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_MODULE_LINK -o $NXT_BUILD_DIR/unit.${NXT_PYTHON_MODULE} \\ +$NXT_BUILD_DIR/${NXT_PYTHON_MODULE}.unit.so: $nxt_objs + $NXT_MODULE_LINK -o $NXT_BUILD_DIR/${NXT_PYTHON_MODULE}.unit.so \\ $nxt_objs $NXT_PYTHON_LIBS END diff --git a/src/nxt_runtime.c b/src/nxt_runtime.c index d9dfa3a5..d18eab0a 100644 --- a/src/nxt_runtime.c +++ b/src/nxt_runtime.c @@ -763,7 +763,7 @@ nxt_runtime_conf_init(nxt_task_t *task, nxt_runtime_t *rt) 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); if (nxt_slow_path(ret != NXT_OK)) { return NXT_ERROR; |