[pan/test2] Run make dist to avoid missing out on renamed files in EXTRA_DIST

[Petr Kovář <pmkovar src gnome org>]

commit 2466f54d52ea9dff9151635335423c2f39c3f2ef
Author: Petr Kovar <pkovar redhat com>
Date:   Mon Dec 6 19:12:33 2021 +0100

    Run make dist to avoid missing out on renamed files in EXTRA_DIST

 .gitlab-ci.yml | 23 +++++++++++++++++------
 autogen.sh     |  5 +++++
 configure.ac   |  2 +-
 3 files changed, 23 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1aa35af..037a0ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,14 @@
+stages:
+  - build
+
 variables:
   DEBIAN_FRONTEND: noninteractive
 
 build-ubuntu-gtk2:
   image: ubuntu:rolling
+  stage: build
+  except:
+    - tags
   before_script:
     - apt-get update
     - apt-get install -q -y --no-install-recommends
@@ -21,12 +27,16 @@ build-ubuntu-gtk2:
         libgnutls28-dev
         yelp-tools
   script:
-    - ./autogen.sh --without-gtk3 --with-gnutls --with-dbus --with-gmime-crypto --with-gtkspell 
--enable-libnotify --enable-gkr --enable-manual
-    - make
-    - make check
+    - mkdir _build
+    - cd _build
+    - ../autogen.sh --without-gtk3 --with-gnutls --with-dbus --with-gmime-crypto --with-gtkspell 
--enable-libnotify --enable-gkr --enable-manual
+    - make && make distcheck
 
 build-ubuntu-gtk3:
   image: ubuntu:rolling
+  stage: build
+  except:
+    - tags
   before_script:
     - apt-get update
     - apt-get install -q -y --no-install-recommends
@@ -47,8 +57,9 @@ build-ubuntu-gtk3:
         libsecret-1-dev
         libgtkspell3-3-dev
         yelp-tools
-
   script:
-    - ./autogen.sh --with-gtk3 --with-gnutls --with-dbus --with-gmime-crypto --with-gtkspell 
--enable-libnotify --enable-gkr --enable-manual
+    - mkdir _build
+    - cd _build
+    - ../autogen.sh --with-gtk3 --with-gnutls --with-dbus --with-gmime-crypto --with-gtkspell 
--enable-libnotify --enable-gkr --enable-manual
     - make
-    - make check
+    - make distcheck
diff --git a/autogen.sh b/autogen.sh
index 6f8dff2..13d5f56 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,6 +14,11 @@ cd $srcdir
     exit 1
 }
 
+# Allow for running make dist in gitlab-ci.yml
+#if [ ! -f "pan-git.version" ] ; then
+#  touch pan-git.version
+#fi
+
 # shellcheck disable=SC2016
 PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
 
diff --git a/configure.ac b/configure.ac
index 7e61faf..a719895 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ if test ! -z $GIT_HASH; then
     GIT_REV="$GIT_HASH $GIT_REMOTE"
   fi
     echo $GIT_REV > pan-git.version
-  elif test -f pan-git.version ; then
+  elif test -s pan-git.version ; then
     GIT_REV=`cat pan-git.version`
   else
     GIT_REV="Unknown"