Merged with the default branch.1.30.0-1

7 files changed, 53 insertions, 55 deletions

diff --git a/auto/modules/go b/auto/modules/go
index a8596bf3..86dfb62d 100644
--- a/auto/modules/go
+++ b/auto/modules/go
@@ -119,15 +119,15 @@ ${NXT_GO}-install-src:
 	install -p -m644 ./go/* \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG}/
 
 ${NXT_GO}-install-env: \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG}/env.go \
-    ${NXT_VERSION_H} ${NXT_BUILD_DIR}/${NXT_LIB_UNIT_STATIC}
+    ${NXT_VERSION_H} ${NXT_BUILD_DIR}/lib/${NXT_LIB_UNIT_STATIC}
 
 \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG}/env.go:
 	install -d \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG}
 	$echo "package unit" > \$@
 	$echo "/*" >> \$@
 	$echo "#cgo CFLAGS: ${CFLAGS} ${NXT_CC_OPT}" >> \$@
-	$echo "#cgo CPPFLAGS: -I${PWD}/src -I${PWD}/${NXT_BUILD_DIR}" >> \$@
-	$echo "#cgo LDFLAGS: -L${PWD}/${NXT_BUILD_DIR} ${NXT_GO_LDFLAGS} ${NXT_LD_OPT}" >> \$@
+	$echo "#cgo CPPFLAGS: -I${PWD}/src -I${PWD}/${NXT_BUILD_DIR}/include" >> \$@
+	$echo "#cgo LDFLAGS: -L${PWD}/${NXT_BUILD_DIR}/lib ${NXT_GO_LDFLAGS} ${NXT_LD_OPT}" >> \$@
 	$echo "*/" >> \$@
 	$echo 'import "C"' >> \$@
 
diff --git a/auto/modules/java b/auto/modules/java
index bdf17022..d87f93c5 100644
--- a/auto/modules/java
+++ b/auto/modules/java
@@ -63,7 +63,7 @@ fi
 . $NXT_AUTOCONF_DATA
 
 
-NXT_JARS=${NXT_JARS=$NXT_MODULES}
+NXT_JARS=${NXT_JARS=$NXT_MODULESDIR}
 NXT_JAVA_MODULE=${NXT_JAVA_MODULE=java}
 NXT_JAVA_LIB_PATH=${NXT_JAVA_LIB_PATH=}
 
@@ -320,7 +320,7 @@ fi
 
 NXT_JAVA_MOUNTS_HEADER=nxt_${NXT_JAVA_MODULE}_mounts.h
 
-cat << END > $NXT_BUILD_DIR/$NXT_JAVA_MOUNTS_HEADER
+cat << END > $NXT_BUILD_DIR/include/$NXT_JAVA_MOUNTS_HEADER
 #ifndef _NXT_JAVA_MOUNTS_H_INCLUDED_
 #define _NXT_JAVA_MOUNTS_H_INCLUDED_
 
@@ -520,24 +520,24 @@ cat << END >> $NXT_MAKEFILE
 
 all: ${NXT_JAVA_MODULE}
 
-${NXT_JAVA_MODULE}: $NXT_BUILD_DIR/${NXT_JAVA_MODULE}.unit.so \
+${NXT_JAVA_MODULE}: $NXT_BUILD_DIR/lib/unit/modules/${NXT_JAVA_MODULE}.unit.so \
     $NXT_BUILD_DIR/$NXT_UNIT_JAR \
     $NXT_BUILD_DIR/$NXT_WS_API_JAR
 
-$NXT_BUILD_DIR/${NXT_JAVA_MODULE}.unit.so: $nxt_objs
-	\$(NXT_MODULE_LINK) -o $NXT_BUILD_DIR/${NXT_JAVA_MODULE}.unit.so \\
-	$nxt_objs $NXT_JAVA_LDFLAGS $NXT_LD_OPT
+$NXT_BUILD_DIR/lib/unit/modules/${NXT_JAVA_MODULE}.unit.so: $nxt_objs
+	\$(NXT_MODULE_LINK) -o \$@ $nxt_objs $NXT_JAVA_LDFLAGS $NXT_LD_OPT
 
 
 install: ${NXT_JAVA_MODULE}-install
 
-${NXT_JAVA_MODULE}-install: $NXT_BUILD_DIR/${NXT_JAVA_MODULE}.unit.so \\
+${NXT_JAVA_MODULE}-install: \\
+    $NXT_BUILD_DIR/lib/unit/modules/${NXT_JAVA_MODULE}.unit.so \\
     $NXT_BUILD_DIR/$NXT_UNIT_JAR \\
     $NXT_BUILD_DIR/$NXT_WS_API_JAR \\
     java-shared-install
-	install -d \$(DESTDIR)$NXT_MODULES
-	install -p $NXT_BUILD_DIR/${NXT_JAVA_MODULE}.unit.so \\
-		\$(DESTDIR)$NXT_MODULES/
+	install -d \$(DESTDIR)$NXT_MODULESDIR
+	install -p $NXT_BUILD_DIR/lib/unit/modules/${NXT_JAVA_MODULE}.unit.so \\
+		\$(DESTDIR)$NXT_MODULESDIR/
 	install -d \$(DESTDIR)$NXT_JARS
 	install -p -m 0644 $NXT_BUILD_DIR/$NXT_UNIT_JAR \$(DESTDIR)$NXT_JARS/
 	install -p -m 0644 $NXT_BUILD_DIR/$NXT_WS_API_JAR \$(DESTDIR)$NXT_JARS/
@@ -546,8 +546,8 @@ ${NXT_JAVA_MODULE}-install: $NXT_BUILD_DIR/${NXT_JAVA_MODULE}.unit.so \\
 uninstall: ${NXT_JAVA_MODULE}-uninstall
 
 ${NXT_JAVA_MODULE}-uninstall: java-shared-uninstall
-	rm -f \$(DESTDIR)$NXT_MODULES/${NXT_JAVA_MODULE}.unit.so
-	@rmdir -p \$(DESTDIR)$NXT_MODULES 2>/dev/null || true
+	rm -f \$(DESTDIR)$NXT_MODULESDIR/${NXT_JAVA_MODULE}.unit.so
+	@rmdir -p \$(DESTDIR)$NXT_MODULESDIR 2>/dev/null || true
 	rm -f \$(DESTDIR)$NXT_JARS/$NXT_UNIT_JAR
 	rm -f \$(DESTDIR)$NXT_JARS/$NXT_WS_API_JAR
 	@rmdir -p \$(DESTDIR)$NXT_JARS 2>/dev/null || true
diff --git a/auto/modules/nodejs b/auto/modules/nodejs
index 7d4f8581..968f3fdf 100644
--- a/auto/modules/nodejs
+++ b/auto/modules/nodejs
@@ -129,7 +129,7 @@ NXT_NODE_VERSION_FILE=${NXT_BUILD_DIR}/src/${NXT_NODE}/version.h
 NXT_NODE_PACKAGE_FILE=${NXT_BUILD_DIR}/src/${NXT_NODE}/package.json
 NXT_NODE_EXPORTS="export UNIT_SRC_PATH=${PWD}/src \
     && export UNIT_BUILD_PATH=${PWD}/${NXT_BUILD_DIR} \
-    && export UNIT_LIB_STATIC_PATH=${PWD}/${NXT_BUILD_DIR}/libunit.a"
+    && export UNIT_LIB_STATIC_PATH=${PWD}/${NXT_BUILD_DIR}/lib/libunit.a"
 
 if [ -n "$NXT_NODE_LOCAL" ]; then
     NXT_NODE_INSTALL=local-install
@@ -149,7 +149,7 @@ cat << END >> $NXT_MAKEFILE
 .PHONY: ${NXT_NODE}-build
 .PHONY: ${NXT_NODE}-publish
 
-${NXT_NODE}: ${NXT_NODE}-copy $NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC
+${NXT_NODE}: ${NXT_NODE}-copy $NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC
 	${NXT_NODE_EXPORTS} && \\
 	cd ${NXT_NODE_TMP} && ${NXT_NODE_GYP} configure build clean
 
@@ -201,7 +201,7 @@ ${NXT_NODE}-local-check:
 	    exit 1)
 
 ${NXT_NODE}-local-install: ${NXT_NODE_TARBALL} ${NXT_NODE}-local-check \
-    $NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC
+    $NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC
 	${NXT_NODE_EXPORTS} && \\
 	mkdir -p \$(DESTDIR)${NXT_NODE_LOCAL} && \\
 	cd \$(DESTDIR)${NXT_NODE_LOCAL} && \\
diff --git a/auto/modules/perl b/auto/modules/perl
index 2daebd0d..3c88ef0e 100644
--- a/auto/modules/perl
+++ b/auto/modules/perl
@@ -185,25 +185,24 @@ cat << END >> $NXT_MAKEFILE
 
 all: ${NXT_PERL_MODULE}
 
-${NXT_PERL_MODULE}:	$NXT_BUILD_DIR/${NXT_PERL_MODULE}.unit.so
+${NXT_PERL_MODULE}:	$NXT_BUILD_DIR/lib/unit/modules/${NXT_PERL_MODULE}.unit.so
 
-$NXT_BUILD_DIR/${NXT_PERL_MODULE}.unit.so:	$nxt_objs
-	\$(NXT_MODULE_LINK) -o $NXT_BUILD_DIR/${NXT_PERL_MODULE}.unit.so \\
-	$nxt_objs $NXT_PERL_LDOPTS $NXT_LD_OPT
+$NXT_BUILD_DIR/lib/unit/modules/${NXT_PERL_MODULE}.unit.so:	$nxt_objs
+	\$(NXT_MODULE_LINK) -o \$@ $nxt_objs $NXT_PERL_LDOPTS $NXT_LD_OPT
 
 
 install: ${NXT_PERL_MODULE}-install
 
 ${NXT_PERL_MODULE}-install: ${NXT_PERL_MODULE} install-check
-	install -d \$(DESTDIR)$NXT_MODULES
-	install -p $NXT_BUILD_DIR/${NXT_PERL_MODULE}.unit.so \\
-		\$(DESTDIR)$NXT_MODULES/
+	install -d \$(DESTDIR)$NXT_MODULESDIR
+	install -p $NXT_BUILD_DIR/lib/unit/modules/${NXT_PERL_MODULE}.unit.so \\
+		\$(DESTDIR)$NXT_MODULESDIR/
 
 
 uninstall: ${NXT_PERL_MODULE}-uninstall
 
 ${NXT_PERL_MODULE}-uninstall:
-	rm -f \$(DESTDIR)$NXT_MODULES/${NXT_PERL_MODULE}.unit.so
-	@rmdir -p \$(DESTDIR)$NXT_MODULES 2>/dev/null || true
+	rm -f \$(DESTDIR)$NXT_MODULESDIR/${NXT_PERL_MODULE}.unit.so
+	@rmdir -p \$(DESTDIR)$NXT_MODULESDIR 2>/dev/null || true
 
 END
diff --git a/auto/modules/php b/auto/modules/php
index f0ecb709..a0f5379c 100644
--- a/auto/modules/php
+++ b/auto/modules/php
@@ -265,25 +265,25 @@ cat << END >> $NXT_MAKEFILE
 
 all: ${NXT_PHP_MODULE}
 
-${NXT_PHP_MODULE}:	$NXT_BUILD_DIR/${NXT_PHP_MODULE}.unit.so
+${NXT_PHP_MODULE}:	$NXT_BUILD_DIR/lib/unit/modules/${NXT_PHP_MODULE}.unit.so
 
-$NXT_BUILD_DIR/${NXT_PHP_MODULE}.unit.so:	$nxt_objs
-	\$(NXT_MODULE_LINK) -o $NXT_BUILD_DIR/${NXT_PHP_MODULE}.unit.so \\
+$NXT_BUILD_DIR/lib/unit/modules/${NXT_PHP_MODULE}.unit.so:	$nxt_objs
+	\$(NXT_MODULE_LINK) -o \$@ \\
 	$nxt_objs ${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS} $NXT_LD_OPT
 
 
 install: ${NXT_PHP_MODULE}-install
 
 ${NXT_PHP_MODULE}-install: ${NXT_PHP_MODULE} install-check
-	install -d \$(DESTDIR)$NXT_MODULES
-	install -p $NXT_BUILD_DIR/${NXT_PHP_MODULE}.unit.so \\
-		\$(DESTDIR)$NXT_MODULES/
+	install -d \$(DESTDIR)$NXT_MODULESDIR
+	install -p $NXT_BUILD_DIR/lib/unit/modules/${NXT_PHP_MODULE}.unit.so \\
+		\$(DESTDIR)$NXT_MODULESDIR/
 
 
 uninstall: ${NXT_PHP_MODULE}-uninstall
 
 ${NXT_PHP_MODULE}-uninstall:
-	rm -f \$(DESTDIR)$NXT_MODULES/${NXT_PHP_MODULE}.unit.so
-	@rmdir -p \$(DESTDIR)$NXT_MODULES 2>/dev/null || true
+	rm -f \$(DESTDIR)$NXT_MODULESDIR/${NXT_PHP_MODULE}.unit.so
+	@rmdir -p \$(DESTDIR)$NXT_MODULESDIR 2>/dev/null || true
 
 END
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
diff --git a/auto/modules/ruby b/auto/modules/ruby
index 608193a6..7a7c9bd3 100644
--- a/auto/modules/ruby
+++ b/auto/modules/ruby
@@ -176,7 +176,7 @@ fi
 
 
 NXT_RUBY_MOUNTS_HEADER=nxt_${NXT_RUBY_MODULE}_mounts.h
-NXT_RUBY_MOUNTS_PATH=$NXT_BUILD_DIR/$NXT_RUBY_MOUNTS_HEADER
+NXT_RUBY_MOUNTS_PATH=$NXT_BUILD_DIR/include/$NXT_RUBY_MOUNTS_HEADER
 
 cat << END > $NXT_RUBY_MOUNTS_PATH
 
@@ -234,7 +234,7 @@ $NXT_BUILD_DIR/$nxt_obj:	$nxt_src $NXT_VERSION_H
 	\$(CC) -c \$(CFLAGS) $NXT_RUBY_CFLAGS -DNXT_RUBY_MOUNTS_H=\"$NXT_RUBY_MOUNTS_HEADER\" \\
            \$(NXT_INCS) $NXT_RUBY_INCPATH \\
 	$nxt_dep_flags \\
-	-o $NXT_BUILD_DIR/$nxt_obj $nxt_src
+	-o \$@ $nxt_src
 	$nxt_dep_post
 
 -include $NXT_BUILD_DIR/$nxt_dep
@@ -251,25 +251,24 @@ cat << END >> $NXT_MAKEFILE
 
 all: ${NXT_RUBY_MODULE}
 
-${NXT_RUBY_MODULE}:	$NXT_BUILD_DIR/${NXT_RUBY_MODULE}.unit.so
+${NXT_RUBY_MODULE}:	$NXT_BUILD_DIR/lib/unit/modules/${NXT_RUBY_MODULE}.unit.so
 
-$NXT_BUILD_DIR/${NXT_RUBY_MODULE}.unit.so:	$nxt_objs
-	\$(NXT_MODULE_LINK) -o $NXT_BUILD_DIR/${NXT_RUBY_MODULE}.unit.so \\
-	$nxt_objs $NXT_RUBY_LIBS $NXT_LD_OPT
+$NXT_BUILD_DIR/lib/unit/modules/${NXT_RUBY_MODULE}.unit.so:	$nxt_objs
+	\$(NXT_MODULE_LINK) -o \$@ $nxt_objs $NXT_RUBY_LIBS $NXT_LD_OPT
 
 
 install: ${NXT_RUBY_MODULE}-install
 
 ${NXT_RUBY_MODULE}-install: ${NXT_RUBY_MODULE} install-check
-	install -d \$(DESTDIR)$NXT_MODULES
-	install -p $NXT_BUILD_DIR/${NXT_RUBY_MODULE}.unit.so \\
-		\$(DESTDIR)$NXT_MODULES/
+	install -d \$(DESTDIR)$NXT_MODULESDIR
+	install -p $NXT_BUILD_DIR/lib/unit/modules/${NXT_RUBY_MODULE}.unit.so \\
+		\$(DESTDIR)$NXT_MODULESDIR/
 
 
 uninstall: ${NXT_RUBY_MODULE}-uninstall
 
 ${NXT_RUBY_MODULE}-uninstall:
-	rm -f \$(DESTDIR)$NXT_MODULES/${NXT_RUBY_MODULE}.unit.so
-	@rmdir -p \$(DESTDIR)$NXT_MODULES 2>/dev/null || true
+	rm -f \$(DESTDIR)$NXT_MODULESDIR/${NXT_RUBY_MODULE}.unit.so
+	@rmdir -p \$(DESTDIR)$NXT_MODULESDIR 2>/dev/null || true
 
 END