Merged with the default branch.1.30.0-1

15 files changed, 208 insertions, 230 deletions

diff --git a/auto/echo/build b/auto/echo/build
index d66c6951..b2396cd0 100644
--- a/auto/echo/build
+++ b/auto/echo/build
@@ -5,15 +5,15 @@
 
 $echo 'building an "echo" program'
 
-rm -f $NXT_BUILD_DIR/echo
+rm -f $NXT_BUILD_DIR/bin/echo
 
-nxt_echo_test="$CC -o $NXT_BUILD_DIR/echo -O $NXT_CC_OPT
+nxt_echo_test="$CC -o $NXT_BUILD_DIR/bin/echo -O $NXT_CC_OPT
                auto/echo/echo.c $NXT_LD_OPT"
 
 # "|| true" is to bypass "set -e" setting.
 nxt_echo_err=`$nxt_echo_test 2>&1 || true`
 
-if [ ! -x $NXT_BUILD_DIR/echo ]; then
+if [ ! -x $NXT_BUILD_DIR/bin/echo ]; then
     $echo
     $echo $0: error: cannot build an \"echo\" program:
     $echo
@@ -24,4 +24,4 @@ if [ ! -x $NXT_BUILD_DIR/echo ]; then
     exit 1
 fi
 
-echo=$NXT_BUILD_DIR/echo
+echo=$NXT_BUILD_DIR/bin/echo
diff --git a/auto/help b/auto/help
index a3884679..f2307e9c 100644
--- a/auto/help
+++ b/auto/help
@@ -11,23 +11,31 @@ cat << END
   --cc-opt=OPTIONS     set additional C compiler options
   --ld-opt=OPTIONS     set additional linker options
 
-  --prefix=DIRECTORY   set prefix for relative pathnames, default: none
-  --bindir=DIRECTORY   set user executables directory name
-                       default: "$NXT_BINDIR"
-  --sbindir=DIRECTORY  set system admin executables directory name
-                       default: "$NXT_SBINDIR"
-  --libdir=DIRECTORY   set library directory name, default: "$NXT_LIBDIR"
-  --incdir=DIRECTORY   set includes directory name, default: "$NXT_INCDIR"
-  --mandir=DIRECTORY   set man pages directory name, default: "$NXT_MANDIR"
-  --modules=DIRECTORY  set modules directory name, default: "$NXT_MODULES"
-  --state=DIRECTORY    set state directory name, default: "$NXT_STATE"
-  --tmp=DIRECTORY      set tmp directory name, default: "$NXT_TMP"
-
-  --pid=FILE           set pid filename, default: "$NXT_PID"
-  --log=FILE           set log filename, default: "$NXT_LOG"
+  --prefix=DIR         default: "/usr/local"
+  --exec-prefix=DIR    default: "\$prefix"
+  --bindir=DIR         default: "\$exec_prefix/bin"
+  --sbindir=DIR        default: "\$exec_prefix/sbin"
+  --includedir=DIR     default: "\$prefix/include"
+  --libdir=DIR         default: "\$exec_prefix/lib"
+  --modulesdir=DIR     default: "\$libdir/unit/modules"
+  --datarootdir=DIR    default: "\$prefix/share"
+  --mandir=DIR         default: "\$datarootdir/man"
+  --localstatedir=DIR  default: "\$prefix/var"
+  --statedir=DIR       default: "\$localstatedir/lib/unit"
+  --runstatedir=DIR    default: "\$localstatedir/run/unit"
+  --logdir=DIR         default: "\$localstatedir/log/unit"
+  --tmpdir=DIR         default: "/tmp"
+
+  --incdir=DIR         [deprecated] synonym for --includedir
+  --modules=DIR        [deprecated] synonym for --modulesdir
+  --state=DIR          [deprecated] synonym for --statedir
+  --tmp=DIR            [deprecated] synonym for --tmpdir
+
+  --pid=FILE           set pid filename, default: "\$runstatedir/unit.pid"
+  --log=FILE           set log filename, default: "\$logdir/unit.log"
 
   --control=ADDRESS    set address of control API socket
-                       default: "$NXT_CONTROL"
+                       default: "unix:\$runstatedir/control.unit.sock"
 
   --user=USER          set non-privileged processes to run as specified user
                        default: "$NXT_USER"
diff --git a/auto/make b/auto/make
index 5324f49c..ecf31826 100644
--- a/auto/make
+++ b/auto/make
@@ -7,9 +7,6 @@
 
 $echo "creating $NXT_MAKEFILE"
 
-mkdir -p $NXT_BUILD_DIR/src \
-         $NXT_BUILD_DIR/src/test
-
 
 cat << END > $NXT_MAKEFILE
 
@@ -25,8 +22,8 @@ NXT_MODULE_LINK =	$NXT_MODULE_LINK
 all: $NXT_DAEMON manpage
 
 .PHONY: $NXT_DAEMON manpage
-$NXT_DAEMON: $NXT_BUILD_DIR/$NXT_DAEMON
-manpage: $NXT_BUILD_DIR/unitd.8
+$NXT_DAEMON: $NXT_BUILD_DIR/sbin/$NXT_DAEMON
+manpage: $NXT_BUILD_DIR/share/man/man8/unitd.8
 
 END
 
@@ -35,7 +32,7 @@ END
 
 $echo -n "NXT_LIB_INCS =" >> $NXT_MAKEFILE
 
-for nxt_inc in src $NXT_BUILD_DIR
+for nxt_inc in src $NXT_BUILD_DIR/include
 do
     $echo -n " -I $nxt_inc" >> $NXT_MAKEFILE
 done
@@ -88,20 +85,17 @@ END
 
 cat << END >> $NXT_MAKEFILE
 
-libnxt:	$NXT_BUILD_DIR/$NXT_LIB_SHARED $NXT_BUILD_DIR/$NXT_LIB_STATIC
+libnxt:	$NXT_BUILD_DIR/lib/$NXT_LIB_SHARED $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC
 
-$NXT_BUILD_DIR/$NXT_LIB_SHARED:	\$(NXT_LIB_OBJS)
-	\$(NXT_SHARED_LOCAL_LINK) -o $NXT_BUILD_DIR/$NXT_LIB_SHARED \\
-		\$(NXT_LIB_OBJS) \\
+$NXT_BUILD_DIR/lib/$NXT_LIB_SHARED: \$(NXT_LIB_OBJS)
+	\$(NXT_SHARED_LOCAL_LINK) -o \$@ \$(NXT_LIB_OBJS) \\
 		$NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS
 
-$NXT_BUILD_DIR/$NXT_LIB_STATIC:	\$(NXT_LIB_OBJS)
-	$NXT_STATIC_LINK $NXT_BUILD_DIR/$NXT_LIB_STATIC \\
-		\$(NXT_LIB_OBJS)
+$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC: \$(NXT_LIB_OBJS)
+	$NXT_STATIC_LINK \$@ \$(NXT_LIB_OBJS)
 
-$NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC:	\$(NXT_LIB_UNIT_OBJS)
-	$NXT_STATIC_LINK $NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC \\
-		\$(NXT_LIB_UNIT_OBJS)
+$NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC: \$(NXT_LIB_UNIT_OBJS)
+	$NXT_STATIC_LINK \$@ \$(NXT_LIB_UNIT_OBJS)
 
 END
 
@@ -195,55 +189,55 @@ tests:		$NXT_BUILD_DIR/tests $NXT_BUILD_DIR/utf8_file_name_test \\
 			$NXT_BUILD_DIR/unit_websocket_echo
 
 $NXT_BUILD_DIR/tests: \$(NXT_TEST_OBJS) \\
-			$NXT_BUILD_DIR/$NXT_LIB_STATIC
+			$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC
 	\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/tests \\
 		\$(CFLAGS) \$(NXT_TEST_OBJS) \\
-		$NXT_BUILD_DIR/$NXT_LIB_STATIC \\
+		$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
 		$NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS
 
 $NXT_BUILD_DIR/utf8_file_name_test: $NXT_LIB_UTF8_FILE_NAME_TEST_SRCS \\
-			$NXT_BUILD_DIR/$NXT_LIB_STATIC
+			$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC
 	\$(CC) \$(CFLAGS) \$(NXT_LIB_INCS) $NXT_LIB_AUX_CFLAGS \\
 		-o $NXT_BUILD_DIR/utf8_file_name_test \\
 		$NXT_LIB_UTF8_FILE_NAME_TEST_SRCS \\
-		$NXT_BUILD_DIR/$NXT_LIB_STATIC \\
+		$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
 		$NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS
 
 $NXT_BUILD_DIR/ncq_test: $NXT_BUILD_DIR/src/test/nxt_ncq_test.o \\
-			$NXT_BUILD_DIR/$NXT_LIB_STATIC
+			$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC
 	\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/ncq_test \\
 		\$(CFLAGS) $NXT_BUILD_DIR/src/test/nxt_ncq_test.o \\
-		$NXT_BUILD_DIR/$NXT_LIB_STATIC \\
+		$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
 		$NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS
 
 $NXT_BUILD_DIR/vbcq_test: $NXT_BUILD_DIR/src/test/nxt_vbcq_test.o \\
-			$NXT_BUILD_DIR/$NXT_LIB_STATIC
+			$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC
 	\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/vbcq_test \\
 		\$(CFLAGS) $NXT_BUILD_DIR/src/test/nxt_vbcq_test.o \\
-		$NXT_BUILD_DIR/$NXT_LIB_STATIC \\
+		$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
 		$NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS
 
 $NXT_BUILD_DIR/unit_app_test: $NXT_BUILD_DIR/src/test/nxt_unit_app_test.o \\
-		$NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC
+		$NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC
 	\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/unit_app_test \\
 		\$(CFLAGS) $NXT_BUILD_DIR/src/test/nxt_unit_app_test.o \\
-		$NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC \\
+		$NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC \\
 		$NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS
 
 $NXT_BUILD_DIR/unit_websocket_chat: \\
 		$NXT_BUILD_DIR/src/test/nxt_unit_websocket_chat.o \\
-		$NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC
+		$NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC
 	\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/unit_websocket_chat \\
 		\$(CFLAGS) $NXT_BUILD_DIR/src/test/nxt_unit_websocket_chat.o \\
-		$NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC \\
+		$NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC \\
 		$NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS
 
 $NXT_BUILD_DIR/unit_websocket_echo: \\
 		$NXT_BUILD_DIR/src/test/nxt_unit_websocket_echo.o \\
-		$NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC
+		$NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC
 	\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/unit_websocket_echo \\
 		\$(CFLAGS) $NXT_BUILD_DIR/src/test/nxt_unit_websocket_echo.o \\
-		$NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC \\
+		$NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC \\
 		$NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS
 
 END
@@ -264,7 +258,7 @@ END
 fi
 
 
-NXT_MAKE_INCS="src $NXT_BUILD_DIR"
+NXT_MAKE_INCS="src $NXT_BUILD_DIR/include"
 NXT_MAKE_SRCS="$NXT_SRCS"
 
 
@@ -298,10 +292,10 @@ $echo >> $NXT_MAKEFILE
 
 cat << END >> $NXT_MAKEFILE
 
-$NXT_BUILD_DIR/$NXT_DAEMON:	$NXT_BUILD_DIR/$NXT_LIB_STATIC \\
+$NXT_BUILD_DIR/sbin/$NXT_DAEMON:	$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
 				\$(NXT_OBJS)
-	\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/$NXT_DAEMON \$(CFLAGS) \\
-		\$(NXT_OBJS) $NXT_BUILD_DIR/$NXT_LIB_STATIC \\
+	\$(NXT_EXEC_LINK) -o \$@ \$(CFLAGS) \\
+		\$(NXT_OBJS) $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
 		$NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS
 
 END
@@ -311,11 +305,12 @@ END
 
 cat << END >> $NXT_MAKEFILE
 
-$NXT_BUILD_DIR/unitd.8: docs/man/unitd.8.in $NXT_BUILD_DIR/nxt_auto_config.h
+$NXT_BUILD_DIR/share/man/man8/unitd.8: docs/man/man8/unitd.8.in \\
+				$NXT_BUILD_DIR/include/nxt_auto_config.h
 	sed -e "s|%%ERROR_LOG_PATH%%|$NXT_LOG|" \\
 		-e "s|%%PID_PATH%%|$NXT_PID|" \\
 		-e "s|%%SOCKET_PATH%%|$NXT_CONTROL|" \\
-		< docs/man/unitd.8.in > \$@
+		< docs/man/man8/unitd.8.in > \$@
 
 END
 
@@ -365,14 +360,19 @@ install-check:
 ${NXT_DAEMON}-install: $NXT_DAEMON install-check
 	test -d \$(DESTDIR)$NXT_SBINDIR \
 		|| install -d \$(DESTDIR)$NXT_SBINDIR
-	install -p $NXT_BUILD_DIR/$NXT_DAEMON \$(DESTDIR)$NXT_SBINDIR/
-	test -d \$(DESTDIR)$NXT_STATE \
-		|| install -d \$(DESTDIR)$NXT_STATE
+	install -p $NXT_BUILD_DIR/sbin/$NXT_DAEMON \$(DESTDIR)$NXT_SBINDIR/
+	test -d \$(DESTDIR)$NXT_STATEDIR \
+		|| install -d \$(DESTDIR)$NXT_STATEDIR
+	test -d \$(DESTDIR)$NXT_LOGDIR \
+		|| install -d \$(DESTDIR)$NXT_LOGDIR
+	test -d \$(DESTDIR)$NXT_RUNSTATEDIR \
+		|| install -d \$(DESTDIR)$NXT_RUNSTATEDIR
 
 manpage-install: manpage install-check
 	test -d \$(DESTDIR)$NXT_MANDIR/man8 \
 		|| install -d \$(DESTDIR)$NXT_MANDIR/man8
-	install -p -m644 $NXT_BUILD_DIR/unitd.8 \$(DESTDIR)$NXT_MANDIR/man8/
+	install -p -m644 $NXT_BUILD_DIR/share/man/man8/unitd.8 \
+		\$(DESTDIR)$NXT_MANDIR/man8/
 
 .PHONY: uninstall ${NXT_DAEMON}-uninstall manpage-uninstall
 
@@ -392,13 +392,13 @@ cat << END >> $NXT_MAKEFILE
 
 .PHONY: libunit-install libunit-uninstall
 
-libunit-install: $NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC
+libunit-install: $NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC
 	test -d \$(DESTDIR)$NXT_LIBDIR \
 		|| install -d \$(DESTDIR)$NXT_LIBDIR
-	install -p -m u=rw,go=r $NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC \
+	install -p -m u=rw,go=r $NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC \
 		\$(DESTDIR)$NXT_LIBDIR/
-	test -d \$(DESTDIR)$NXT_INCDIR \
-		|| install -d \$(DESTDIR)$NXT_INCDIR
+	test -d \$(DESTDIR)$NXT_INCLUDEDIR \
+		|| install -d \$(DESTDIR)$NXT_INCLUDEDIR
 	install -p -m u=rw,go=r src/nxt_unit.h \
 		src/nxt_unit_field.h \
 		src/nxt_unit_request.h \
@@ -406,25 +406,25 @@ libunit-install: $NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC
 		src/nxt_unit_sptr.h \
 		src/nxt_unit_typedefs.h \
 		src/nxt_unit_websocket.h \
-		$NXT_BUILD_DIR/nxt_auto_config.h \
-		$NXT_BUILD_DIR/nxt_version.h \
+		$NXT_BUILD_DIR/include/nxt_auto_config.h \
+		$NXT_BUILD_DIR/include/nxt_version.h \
 		src/nxt_websocket_header.h \
-		\$(DESTDIR)$NXT_INCDIR/
+		\$(DESTDIR)$NXT_INCLUDEDIR/
 
 libunit-uninstall:
 	rm -f \$(DESTDIR)$NXT_LIBDIR/$NXT_LIB_UNIT_STATIC
 	@rmdir -p \$(DESTDIR)$NXT_LIBDIR 2>/dev/null || true
-	rm -f \$(DESTDIR)$NXT_INCDIR/nxt_unit.h \
-		\$(DESTDIR)$NXT_INCDIR/nxt_unit_field.h \
-		\$(DESTDIR)$NXT_INCDIR/nxt_unit_request.h \
-		\$(DESTDIR)$NXT_INCDIR/nxt_unit_response.h \
-		\$(DESTDIR)$NXT_INCDIR/nxt_unit_sptr.h \
-		\$(DESTDIR)$NXT_INCDIR/nxt_unit_typedefs.h \
-		\$(DESTDIR)$NXT_INCDIR/nxt_unit_websocket.h \
-		\$(DESTDIR)$NXT_INCDIR/nxt_auto_config.h \
-		\$(DESTDIR)$NXT_INCDIR/nxt_version.h \
-		\$(DESTDIR)$NXT_INCDIR/nxt_websocket_header.h
-	@rmdir -p \$(DESTDIR)$NXT_INCDIR 2>/dev/null || true
+	rm -f \$(DESTDIR)$NXT_INCLUDEDIR/nxt_unit.h \
+		\$(DESTDIR)$NXT_INCLUDEDIR/nxt_unit_field.h \
+		\$(DESTDIR)$NXT_INCLUDEDIR/nxt_unit_request.h \
+		\$(DESTDIR)$NXT_INCLUDEDIR/nxt_unit_response.h \
+		\$(DESTDIR)$NXT_INCLUDEDIR/nxt_unit_sptr.h \
+		\$(DESTDIR)$NXT_INCLUDEDIR/nxt_unit_typedefs.h \
+		\$(DESTDIR)$NXT_INCLUDEDIR/nxt_unit_websocket.h \
+		\$(DESTDIR)$NXT_INCLUDEDIR/nxt_auto_config.h \
+		\$(DESTDIR)$NXT_INCLUDEDIR/nxt_version.h \
+		\$(DESTDIR)$NXT_INCLUDEDIR/nxt_websocket_header.h
+	@rmdir -p \$(DESTDIR)$NXT_INCLUDEDIR 2>/dev/null || true
 
 END
 
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
diff --git a/auto/options b/auto/options
index abcf531d..5487be7f 100644
--- a/auto/options
+++ b/auto/options
@@ -9,8 +9,6 @@ NXT_CFLAGS=
 NXT_CC_OPT=
 NXT_LD_OPT=
 
-NXT_PREFIX=
-
 NXT_DEBUG=NO
 
 NXT_INET6=YES
@@ -44,6 +42,8 @@ NXT_TEST_BUILD_HPUX_SENDFILE=NO
 
 NXT_TESTS=NO
 
+NXT_HELP=NO
+
 for nxt_option
 do
     case "$nxt_option" in
@@ -57,14 +57,35 @@ do
         --ld-opt=*)                      NXT_LD_OPT="$value"                 ;;
 
         --prefix=*)                      NXT_PREFIX="$value"                 ;;
+        --exec-prefix=*)                 NXT_EXEC_PREFIX="$value"            ;;
         --bindir=*)                      NXT_BINDIR="$value"                 ;;
         --sbindir=*)                     NXT_SBINDIR="$value"                ;;
+        --includedir=*)                  NXT_INCLUDEDIR="$value"             ;;
+        --incdir=*)
+            >&2 echo "[warn] option --incdir is deprecated; use --includedir"
+            NXT_INCLUDEDIR="$value"
+        ;;
         --libdir=*)                      NXT_LIBDIR="$value"                 ;;
-        --incdir=*)                      NXT_INCDIR="$value"                 ;;
+        --modulesdir=*)                  NXT_MODULESDIR="$value"             ;;
+        --modules=*)
+            >&2 echo "[warn] option --modules is deprecated; use --modulesdir"
+            NXT_MODULESDIR="$value"
+        ;;
+        --datarootdir=*)                 NXT_DATAROOTDIR="$value"            ;;
         --mandir=*)                      NXT_MANDIR="$value"                 ;;
-        --modules=*)                     NXT_MODULES="$value"                ;;
-        --state=*)                       NXT_STATE="$value"                  ;;
-        --tmp=*)                         NXT_TMP="$value"                    ;;
+        --localstatedir=*)               NXT_LOCALSTATEDIR="$value"          ;;
+        --statedir=*)                    NXT_STATEDIR="$value"               ;;
+        --state=*)
+            >&2 echo "[warn] option --state is deprecated; use --statedir"
+            NXT_STATEDIR="$value"
+        ;;
+        --logdir=*)                      NXT_LOGDIR="$value"                 ;;
+        --runstatedir=*)                 NXT_RUNSTATEDIR="$value"            ;;
+        --tmpdir=*)                      NXT_TMPDIR="$value"                 ;;
+        --tmp=*)
+            >&2 echo "[warn] option --tmp is deprecated; use --tmpdir"
+            NXT_TMPDIR="$value"
+        ;;
 
         --pid=*)                         NXT_PID="$value"                    ;;
         --log=*)                         NXT_LOG="$value"                    ;;
@@ -124,63 +145,26 @@ do
 done
 
 
-case "$NXT_PREFIX" in
-    ""|*/)  ;;
-     *)  NXT_PREFIX="$NXT_PREFIX/"  ;;
-esac
-
-case "$NXT_BINDIR" in
-    /*)  ;;
-     *)  NXT_BINDIR="$NXT_PREFIX$NXT_BINDIR"  ;;
-esac
-
-case "$NXT_SBINDIR" in
-    /*)  ;;
-     *)  NXT_SBINDIR="$NXT_PREFIX$NXT_SBINDIR"  ;;
-esac
-
-case "$NXT_LIBDIR" in
-    /*)  ;;
-     *)  NXT_LIBDIR="$NXT_PREFIX$NXT_LIBDIR"  ;;
-esac
-
-case "$NXT_INCDIR" in
-    /*)  ;;
-     *)  NXT_INCDIR="$NXT_PREFIX$NXT_INCDIR"  ;;
-esac
-
-case "$NXT_MANDIR" in
-    /*)  ;;
-     *)  NXT_MANDIR="$NXT_PREFIX$NXT_MANDIR"  ;;
-esac
-
-case "$NXT_MODULES" in
-    /*)  ;;
-     *)  NXT_MODULES="$NXT_PREFIX$NXT_MODULES"  ;;
-esac
-
-case "$NXT_STATE" in
-    /*)  ;;
-     *)  NXT_STATE="$NXT_PREFIX$NXT_STATE"  ;;
-esac
-
-case "$NXT_TMP" in
-    /*)  ;;
-     *)  NXT_TMP="$NXT_PREFIX$NXT_TMP"  ;;
-esac
-
-case "$NXT_PID" in
-    /*)  ;;
-     *)  NXT_PID="$NXT_PREFIX$NXT_PID"  ;;
-esac
-
-case "$NXT_LOG" in
-    /*)  ;;
-     *)  NXT_LOG="$NXT_PREFIX$NXT_LOG"  ;;
-esac
-
-case "$NXT_CONTROL" in
-    unix:/*)  ;;
-    unix:*)   NXT_CONTROL="unix:$NXT_PREFIX${NXT_CONTROL##unix:}" ;;
-    *)        ;;
-esac
+NXT_PREFIX="${NXT_PREFIX-"/usr/local"}"
+
+NXT_EXEC_PREFIX="${NXT_EXEC_PREFIX-"$NXT_PREFIX"}"
+NXT_BINDIR="${NXT_BINDIR-"$NXT_EXEC_PREFIX/bin"}"
+NXT_SBINDIR="${NXT_SBINDIR-"$NXT_EXEC_PREFIX/sbin"}"
+
+NXT_INCLUDEDIR="${NXT_INCLUDEDIR-"$NXT_PREFIX/include"}"
+
+NXT_LIBDIR="${NXT_LIBDIR-"$NXT_PREFIX/lib"}"
+NXT_MODULESDIR="${NXT_MODULESDIR-"$NXT_LIBDIR/unit/modules"}"
+
+NXT_DATAROOTDIR="${NXT_DATAROOTDIR-"$NXT_PREFIX/share"}"
+NXT_MANDIR="${NXT_MANDIR-"$NXT_DATAROOTDIR/man"}"
+
+NXT_LOCALSTATEDIR="${NXT_LOCALSTATEDIR-"$NXT_PREFIX/var"}"
+NXT_STATEDIR="${NXT_STATEDIR-"$NXT_LOCALSTATEDIR/lib/unit"}"
+NXT_LOGDIR="${NXT_LOGDIR-"$NXT_LOCALSTATEDIR/log/unit"}"
+NXT_LOG="${NXT_LOG-"$NXT_LOGDIR/unit.log"}"
+NXT_RUNSTATEDIR="${NXT_RUNSTATEDIR-"$NXT_LOCALSTATEDIR/run/unit"}"
+NXT_CONTROL="${NXT_CONTROL-"unix:$NXT_RUNSTATEDIR/control.unit.sock"}"
+NXT_PID="${NXT_PID-"$NXT_RUNSTATEDIR/unit.pid"}"
+
+NXT_TMPDIR="${NXT_TMPDIR-"/tmp"}"
diff --git a/auto/os/conf b/auto/os/conf
index 02c4afaf..bc1f5ef7 100644
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -33,7 +33,7 @@ case "$NXT_SYSTEM" in
 
         NXT_LIB_STATIC="libnxt.a"
         NXT_LIB_SHARED="libnxt.so"
-        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/libnxt.so"
+        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/lib/libnxt.so"
 
         NXT_LIB_UNIT_STATIC="libunit.a"
 
@@ -57,7 +57,7 @@ case "$NXT_SYSTEM" in
 
         NXT_LIB_STATIC="libnxt.a"
         NXT_LIB_SHARED="libnxt.so"
-        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/libnxt.so"
+        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/lib/libnxt.so"
 
         NXT_LIB_UNIT_STATIC="libunit.a"
 
@@ -88,7 +88,7 @@ case "$NXT_SYSTEM" in
 
         NXT_LIB_STATIC="libnxt.a"
         NXT_LIB_SHARED="libnxt.so"
-        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/libnxt.so"
+        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/lib/libnxt.so"
 
         NXT_LIB_UNIT_STATIC="libunit.a"
 
@@ -117,7 +117,7 @@ case "$NXT_SYSTEM" in
 
         NXT_LIB_STATIC="libnxt.a"
         NXT_LIB_SHARED="libnxt.dylib"
-        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/libnxt.dylib"
+        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/lib/libnxt.dylib"
 
         NXT_LIB_UNIT_STATIC="libunit.a"
 
@@ -141,7 +141,7 @@ case "$NXT_SYSTEM" in
 
         NXT_LIB_STATIC="libnxt.a"
         NXT_LIB_SHARED="libnxt.so"
-        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/libnxt.so"
+        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/lib/libnxt.so"
 
         NXT_LIB_UNIT_STATIC="libunit.a"
 
@@ -163,7 +163,7 @@ case "$NXT_SYSTEM" in
 
         NXT_LIB_STATIC="libnxt.a"
         NXT_LIB_SHARED="libnxt.so"
-        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/libnxt.so"
+        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/lib/libnxt.so"
 
         NXT_LIB_UNIT_STATIC="libunit.a"
 
@@ -185,7 +185,7 @@ case "$NXT_SYSTEM" in
 
         NXT_LIB_STATIC="libnxt.a"
         NXT_LIB_SHARED="libnxt.so"
-        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/libnxt.so"
+        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/lib/libnxt.so"
 
         NXT_LIB_UNIT_STATIC="libunit.a"
 
@@ -206,7 +206,7 @@ case "$NXT_SYSTEM" in
 
         NXT_LIB_STATIC="libnxt.a"
         NXT_LIB_SHARED="libnxt.so"
-        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/libnxt.so"
+        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/lib/libnxt.so"
 
         NXT_LIB_UNIT_STATIC="libunit.a"
 
@@ -227,7 +227,7 @@ case "$NXT_SYSTEM" in
 
         NXT_LIB_STATIC="libnxt.a"
         NXT_LIB_SHARED="libnxt.so"
-        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/libnxt.so"
+        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/lib/libnxt.so"
 
         NXT_LIB_UNIT_STATIC="libunit.a"
 
@@ -248,7 +248,7 @@ case "$NXT_SYSTEM" in
 
         NXT_LIB_STATIC="libnxt.a"
         NXT_LIB_SHARED="libnxt.so"
-        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/libnxt.so"
+        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/lib/libnxt.so"
 
         NXT_LIB_UNIT_STATIC="libunit.a"
 
@@ -268,7 +268,7 @@ case "$NXT_SYSTEM" in
 
         NXT_LIB_STATIC="libnxt.a"
         NXT_LIB_SHARED="libnxt.so"
-        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/libnxt.so"
+        NXT_LIB_SHARED_LOCAL="$NXT_BUILD_DIR/lib/libnxt.so"
 
         NXT_LIB_UNIT_STATIC="libunit.a"
 
diff --git a/auto/save b/auto/save
index 19ef09ec..9fb0ca12 100644
--- a/auto/save
+++ b/auto/save
@@ -21,14 +21,14 @@ NXT_TEST_LIBS='$NXT_TEST_LIBS'
 
 NXT_LIBRT='$NXT_LIBRT'
 
-echo=$NXT_BUILD_DIR/echo
+echo=$NXT_BUILD_DIR/bin/echo
 
 NXT_LIB_AUX_CFLAGS=
 NXT_LIB_AUX_LIBS=
 
 NXT_LIB_UNIT_STATIC='$NXT_LIB_UNIT_STATIC'
 
-NXT_MODULES='$NXT_MODULES'
-NXT_TMP='$NXT_TMP'
+NXT_MODULESDIR='$NXT_MODULESDIR'
+NXT_TMPDIR='$NXT_TMPDIR'
 
 END
diff --git a/auto/sources b/auto/sources
index 2ca78844..f4a7170a 100644
--- a/auto/sources
+++ b/auto/sources
@@ -92,6 +92,7 @@ NXT_LIB_SRCS=" \
     src/nxt_http_error.c \
     src/nxt_http_route.c \
     src/nxt_http_route_addr.c \
+    src/nxt_http_rewrite.c \
     src/nxt_http_return.c \
     src/nxt_http_static.c \
     src/nxt_http_proxy.c \
@@ -108,19 +109,6 @@ NXT_LIB_SRCS=" \
     src/nxt_fs.c \
 "
 
-NXT_LIB_SRC0=" \
-    src/nxt_buf_filter.c \
-    src/nxt_job_file.c \
-    src/nxt_stream_module.c \
-    src/nxt_stream_source.c \
-    src/nxt_upstream_source.c \
-    src/nxt_http_source.c \
-    src/nxt_fastcgi_source.c \
-    src/nxt_fastcgi_record_parse.c \
-\
-    src/nxt_mem_pool_cleanup.h \
-    src/nxt_mem_pool_cleanup.c \
-"
 
 NXT_LIB_UNIT_SRCS="src/nxt_unit.c"
 
@@ -136,7 +124,7 @@ NXT_LIB_PCRE_SRCS="src/nxt_pcre.c"
 NXT_LIB_PCRE2_SRCS="src/nxt_pcre2.c"
 
 if [ "$NXT_NJS" != "NO" ]; then
-    NXT_LIB_SRCS="$NXT_LIB_SRCS src/nxt_js.c src/nxt_http_js.c"
+    NXT_LIB_SRCS="$NXT_LIB_SRCS src/nxt_js.c src/nxt_http_js.c src/nxt_script.c"
 fi
 
 NXT_LIB_EPOLL_SRCS="src/nxt_epoll_engine.c"
diff --git a/auto/summary b/auto/summary
index 51db0eae..fabe3b10 100644
--- a/auto/summary
+++ b/auto/summary
@@ -10,11 +10,11 @@ Unit configuration summary:
   bin directory: ............. "$NXT_BINDIR"
   sbin directory: ............ "$NXT_SBINDIR"
   lib directory: ............. "$NXT_LIBDIR"
-  include directory: ......... "$NXT_INCDIR"
+  include directory: ......... "$NXT_INCLUDEDIR"
   man pages directory: ....... "$NXT_MANDIR"
-  modules directory: ......... "$NXT_MODULES"
-  state directory: ........... "$NXT_STATE"
-  tmp directory: ............. "$NXT_TMP"
+  modules directory: ......... "$NXT_MODULESDIR"
+  state directory: ........... "$NXT_STATEDIR"
+  tmp directory: ............. "$NXT_TMPDIR"
 
   pid file: .................. "$NXT_PID"
   log file: .................. "$NXT_LOG"