Packages: get rid of deprecated configure options.

8 files changed, 20 insertions, 20 deletions

diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index 580cb655..ccd2bd35 100644
--- a/pkg/deb/Makefile
+++ b/pkg/deb/Makefile
@@ -117,11 +117,11 @@ endif
 
 CONFIGURE_ARGS_COMMON=\
 	--prefix=/usr \
-	--state=/var/lib/unit \
+	--libstatedir=/var/lib/unit \
 	--control="unix:/var/run/control.unit.sock" \
 	--pid=/var/run/unit.pid \
 	--log=/var/log/unit.log \
-	--tmp=/var/tmp \
+	--tmpdir=/var/tmp \
 	--user=unit \
 	--group=unit \
 	--tests \
diff --git a/pkg/deb/debian.module/rules-noarch.in b/pkg/deb/debian.module/rules-noarch.in
index 0f05aaba..e56e06bc 100644
--- a/pkg/deb/debian.module/rules-noarch.in
+++ b/pkg/deb/debian.module/rules-noarch.in
@@ -35,7 +35,7 @@ configure.unit: config.env.unit
 	cd $(BUILDDIR_unit) && \
 	CFLAGS= ./configure \
 		%%CONFIGURE_ARGS%% \
-		--modules=/usr/lib/unit/modules \
+		--modulesdir=/usr/lib/unit/modules \
 		--cc-opt="$(CFLAGS)" && \
 	./configure %%MODULE_CONFARGS%%
 	touch $@
@@ -44,7 +44,7 @@ configure.unit_debug: config.env.unit_debug
 	cd $(BUILDDIR_unit_debug) && \
 	CFLAGS= ./configure \
 		%%CONFIGURE_ARGS%% \
-		--modules=/usr/lib/unit/debug-modules \
+		--modulesdir=/usr/lib/unit/debug-modules \
 		--cc-opt="$(CFLAGS)" \
 		--debug && \
 	./configure %%MODULE_CONFARGS%%
diff --git a/pkg/deb/debian.module/rules.in b/pkg/deb/debian.module/rules.in
index f1217553..861a9c00 100755
--- a/pkg/deb/debian.module/rules.in
+++ b/pkg/deb/debian.module/rules.in
@@ -35,7 +35,7 @@ configure.unit: config.env.unit
 	cd $(BUILDDIR_unit) && \
 	CFLAGS= ./configure \
 		%%CONFIGURE_ARGS%% \
-		--modules=/usr/lib/unit/modules \
+		--modulesdir=/usr/lib/unit/modules \
 		--cc-opt="$(CFLAGS)" && \
 	./configure %%MODULE_CONFARGS%%
 	touch $@
@@ -44,7 +44,7 @@ configure.unit_debug: config.env.unit_debug
 	cd $(BUILDDIR_unit_debug) && \
 	CFLAGS= ./configure \
 		%%CONFIGURE_ARGS%% \
-		--modules=/usr/lib/unit/debug-modules \
+		--modulesdir=/usr/lib/unit/debug-modules \
 		--cc-opt="$(CFLAGS)" \
 		--debug && \
 	./configure %%MODULE_CONFARGS%%
diff --git a/pkg/deb/debian/rules.in b/pkg/deb/debian/rules.in
index 23812926..0fe34b72 100644
--- a/pkg/deb/debian/rules.in
+++ b/pkg/deb/debian/rules.in
@@ -48,7 +48,7 @@ configure.unit: config.env.unit
 	PKG_CONFIG_PATH=$(CURDIR)/pkg/contrib/njs/build \
 	CFLAGS= ./configure \
 		%%CONFIGURE_ARGS%% \
-		--modules=/usr/lib/unit/modules \
+		--modulesdir=/usr/lib/unit/modules \
 		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		--cc-opt="$(CFLAGS)" \
 		--ld-opt="$(LDFLAGS)"
@@ -59,7 +59,7 @@ configure.unit_debug: config.env.unit_debug
 	PKG_CONFIG_PATH=$(CURDIR)/pkg/contrib/njs/build \
 	CFLAGS= ./configure \
 		%%CONFIGURE_ARGS%% \
-		--modules=/usr/lib/unit/debug-modules \
+		--modulesdir=/usr/lib/unit/debug-modules \
 		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		--cc-opt="$(CFLAGS)" \
 		--ld-opt="$(LDFLAGS)" \
diff --git a/pkg/docker/template.Dockerfile b/pkg/docker/template.Dockerfile
index 2d964eb6..29419902 100644
--- a/pkg/docker/template.Dockerfile
+++ b/pkg/docker/template.Dockerfile
@@ -14,28 +14,28 @@ RUN set -ex \
     && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
     && LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
     && CONFIGURE_ARGS="--prefix=/usr \
-                --state=/var/lib/unit \
+                --libstatedir=/var/lib/unit \
                 --control=unix:/var/run/control.unit.sock \
                 --pid=/var/run/unit.pid \
                 --log=/var/log/unit.log \
-                --tmp=/var/tmp \
+                --tmpdir=/var/tmp \
                 --user=unit \
                 --group=unit \
                 --openssl \
                 --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/debug-modules --debug \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
     && make -j $NCPU unitd \
     && install -pm755 build/unitd /usr/sbin/unitd-debug \
     && make clean \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/modules \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \
     && make -j $NCPU unitd \
     && install -pm755 build/unitd /usr/sbin/unitd \
     && make clean \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/debug-modules --debug \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
     && ./configure @@CONFIGURE@@ \
     && make -j $NCPU @@INSTALL@@ \
     && make clean \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
     && ./configure @@CONFIGURE@@ \
     && make -j $NCPU @@INSTALL@@ \
     && ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
index 5c104ca3..a6efb625 100644
--- a/pkg/rpm/Makefile
+++ b/pkg/rpm/Makefile
@@ -108,11 +108,11 @@ endif
 
 CONFIGURE_ARGS_COMMON=\
 	--prefix=/usr \
-	--state=%{_sharedstatedir}/unit \
+	--libstatedir=%{_sharedstatedir}/unit \
 	--control="unix:/var/run/unit/control.sock" \
 	--pid=/var/run/unit/unit.pid \
 	--log=/var/log/unit/unit.log \
-	--tmp=/var/tmp \
+	--tmpdir=/var/tmp \
 	--user=unit \
 	--group=unit \
 	--tests \
diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in
index bc68a254..04323afc 100644
--- a/pkg/rpm/unit.module.spec.in
+++ b/pkg/rpm/unit.module.spec.in
@@ -61,7 +61,7 @@ tar --strip-components=1 -zxf %{SOURCE0}
 %build
 ./configure \
 	%{CONFIGURE_ARGS} \
-	--modules=%{_libdir}/unit/debug-modules \
+	--modulesdir=%{_libdir}/unit/debug-modules \
 	--cc-opt="%{CC_OPT}" \
 	--debug
 ./configure %%MODULE_CONFARGS%%
@@ -69,7 +69,7 @@ make %%MODULE_MAKEARGS%%
 %{__mv} build build-debug
 ./configure \
 	%{CONFIGURE_ARGS} \
-	--modules=%{_libdir}/unit/modules \
+	--modulesdir=%{_libdir}/unit/modules \
 	--cc-opt="%{CC_OPT}"
 ./configure %%MODULE_CONFARGS%%
 make %%MODULE_MAKEARGS%%
diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in
index 06880fcf..4259e013 100644
--- a/pkg/rpm/unit.spec.in
+++ b/pkg/rpm/unit.spec.in
@@ -80,7 +80,7 @@ Library and include files required for NGINX Unit modules development.
 PKG_CONFIG_PATH=%{bdir}/pkg/contrib/njs/build \
 ./configure \
 	%{CONFIGURE_ARGS} \
-	--modules=%{_libdir}/unit/debug-modules \
+	--modulesdir=%{_libdir}/unit/debug-modules \
 	--libdir=%{_libdir} \
 	--cc-opt="%{CC_OPT}" \
 	--ld-opt="%{LD_OPT}" \
@@ -92,7 +92,7 @@ PKG_CONFIG_PATH=%{bdir}/pkg/contrib/njs/build \
 PKG_CONFIG_PATH=%{bdir}/pkg/contrib/njs/build \
 ./configure \
 	%{CONFIGURE_ARGS} \
-	--modules=%{_libdir}/unit/modules \
+	--modulesdir=%{_libdir}/unit/modules \
 	--libdir=%{_libdir} \
 	--cc-opt="%{CC_OPT}" \
 	--ld-opt="%{LD_OPT}"