dnsdist: Run `set-configure-ac-version.sh` in `meson`'s dist script

diff --git a/builder-support/dockerfiles/Dockerfile.dnsdist b/builder-support/dockerfiles/Dockerfile.dnsdist
index 1bf87e8f3fd1aa62cee6555f0dbf0491734f58ce..303f08209cf9aafe501550b8438f7c0998e885e7 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.dnsdist
+++ b/builder-support/dockerfiles/Dockerfile.dnsdist
@@ -19,7 +19,6 @@ RUN mkdir /sdist
 ARG BUILDER_VERSION
 
 RUN cd /dnsdist/pdns/dnsdistdist && \
-   /dnsdist/builder/helpers/set-configure-ac-version.sh && \
     meson setup build && \
     meson dist -C build
 WORKDIR /dnsdist/pdns/dnsdistdist

diff --git a/pdns/dnsdistdist/meson-dist-script.sh b/pdns/dnsdistdist/meson-dist-script.sh
index e6966aba3e143f285868d9411d90158e7d4469c8..4b60c9e555d403adc0a58b019b2190c45931f34b 100755 (executable)
--- a/pdns/dnsdistdist/meson-dist-script.sh
+++ b/pdns/dnsdistdist/meson-dist-script.sh
@@ -18,6 +18,8 @@ cmp "$MESON_SOURCE_ROOT"/../../builder-support/gen-version "$MESON_PROJECT_DIST_
 # Extract them over the existing symbolic links
 tar -C "$MESON_SOURCE_ROOT" -hcf - $symlinks | tar -xf - -C "$MESON_PROJECT_DIST_ROOT"
 
+# set the proper version in configure.ac
+"$MESON_SOURCE_ROOT"/../../builder/helpers/set-configure-ac-version.sh
 # Run autoconf for people using autotools to build, this creates a configure script with VERSION set
 echo Running autoreconf -vi so distfile is still usable for autotools building
 # Run autoconf for people using autotools to build, this creates a configure sc