summaryrefslogtreecommitdiffhomepage
path: root/auto/modules/python
diff options
context:
space:
mode:
Diffstat (limited to 'auto/modules/python')
-rw-r--r--auto/modules/python18
1 files changed, 9 insertions, 9 deletions
diff --git a/auto/modules/python b/auto/modules/python
index 480ae1da..dfd632a1 100644
--- a/auto/modules/python
+++ b/auto/modules/python
@@ -157,7 +157,7 @@ for p in sys.path:
print("};\n\n")
-' > $NXT_BUILD_DIR/$NXT_PYTHON_MOUNTS_HEADER
+' > $NXT_BUILD_DIR/include/$NXT_PYTHON_MOUNTS_HEADER
$echo " + Python module: ${NXT_PYTHON_MODULE}.unit.so"
@@ -213,25 +213,25 @@ cat << END >> $NXT_MAKEFILE
all: ${NXT_PYTHON_MODULE}
-${NXT_PYTHON_MODULE}: $NXT_BUILD_DIR/${NXT_PYTHON_MODULE}.unit.so
+${NXT_PYTHON_MODULE}: $NXT_BUILD_DIR/lib/unit/modules/${NXT_PYTHON_MODULE}.unit.so
-$NXT_BUILD_DIR/${NXT_PYTHON_MODULE}.unit.so: $nxt_objs
- \$(NXT_MODULE_LINK) -o $NXT_BUILD_DIR/${NXT_PYTHON_MODULE}.unit.so \\
+$NXT_BUILD_DIR/lib/unit/modules/${NXT_PYTHON_MODULE}.unit.so: $nxt_objs
+ \$(NXT_MODULE_LINK) -o \$@ \\
$nxt_objs $NXT_PYTHON_LIBS $NXT_PYTHON_LDFLAGS $NXT_LD_OPT
install: ${NXT_PYTHON_MODULE}-install
${NXT_PYTHON_MODULE}-install: ${NXT_PYTHON_MODULE} install-check
- install -d \$(DESTDIR)$NXT_MODULES
- install -p $NXT_BUILD_DIR/${NXT_PYTHON_MODULE}.unit.so \\
- \$(DESTDIR)$NXT_MODULES/
+ install -d \$(DESTDIR)$NXT_MODULESDIR
+ install -p $NXT_BUILD_DIR/lib/unit/modules/${NXT_PYTHON_MODULE}.unit.so \\
+ \$(DESTDIR)$NXT_MODULESDIR/
uninstall: ${NXT_PYTHON_MODULE}-uninstall
${NXT_PYTHON_MODULE}-uninstall:
- rm -f \$(DESTDIR)$NXT_MODULES/${NXT_PYTHON_MODULE}.unit.so
- @rmdir -p \$(DESTDIR)$NXT_MODULES 2>/dev/null || true
+ rm -f \$(DESTDIR)$NXT_MODULESDIR/${NXT_PYTHON_MODULE}.unit.so
+ @rmdir -p \$(DESTDIR)$NXT_MODULESDIR 2>/dev/null || true
END