maint: Fix (and CICD-test) builddir!=srcdir bootstrap builds.
Signed-off-by: Simon Josefsson <simon@josefsson.org>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b422b8b..4ec1426 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,11 +40,13 @@
- env DEBIAN_FRONTEND=noninteractive apt-get install -y -qq make git autoconf automake libtool bison texinfo texlive texlive-generic-recommended texlive-extra-utils help2man gtk-doc-tools valgrind abigail-tools
script:
- ./bootstrap
- - ./configure --enable-gcc-warnings
+ - mkdir b
+ - cd b
+ - ../configure --enable-gcc-warnings
- make -j$(nproc)
- make -j$(nproc) check
- make abi-check
- - make syntax-check dist
+ - make syntax-check distcheck
artifacts:
expire_in: 2 weeks
when: on_success
@@ -63,7 +65,7 @@
- make -j$(nproc)
- make -j$(nproc) check
- make abi-check
- - make syntax-check distcheck
+ - make syntax-check dist
artifacts:
expire_in: 2 weeks
when: on_success
diff --git a/Makefile.am b/Makefile.am
index 87ac3c6..c6bf943 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,8 +98,8 @@
echo $(VERSION) > $@-t && mv $@-t $@
dist-hook: gen-ChangeLog
echo $(VERSION) > $(distdir)/.tarball-version
- if test -d "$(top_srcdir)/devel";then \
- $(MAKE) -C $(top_srcdir) abi-check-latest; \
+ if test -d "$(top_srcdir)/devel"; then \
+ $(MAKE) -C $(top_builddir) abi-check-latest; \
make -C doc/ compare-makefile; \
fi
