X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=blobdiff_plain;f=gen_changelog.sh;h=b4f5bc883760e2aea2eb0002249457dd192dcace;hp=b2b68e9a422aadc3f48e129c88ab524a60045a21;hb=refs%2Fheads%2Fmaster;hpb=7099c38736b97970194f90d1bc3130c27e0a3f6b

diff --git a/gen_changelog.sh b/gen_changelog.sh
index b2b68e9a..b47a1a2d 100755
--- a/gen_changelog.sh
+++ b/gen_changelog.sh
@@ -11,11 +11,11 @@
 
 builddir="$2"
 
-cd "$1"
+cd "$1" || exit
 
 [ ! -e "ChangeLog.gqview" ] && exit 1
-[ ! -x "$(command -v git)" ] && exit 0
-[ ! -d ".git" ] && exit 0
+[ ! -x "$(command -v git)" ] && exit 1
+[ ! -d ".git" ] && exit 1
 
 LC_ALL=C git log --no-merges --no-notes --encoding=UTF-8 --no-follow --use-mailmap 1b58572cf58e9d2d4a0305108395dab5c66d3a09..HEAD > "$builddir/ChangeLog.$$.new" && \
 cat ChangeLog.gqview >> "$builddir/ChangeLog.$$.new" && \
@@ -38,4 +38,15 @@ echo "</html>" >> "$builddir/ChangeLog.$$.new.html"
 rm "$builddir/ChangeLog.$$.old.html"
 mv -f "$builddir/ChangeLog.$$.new.html" "$builddir/ChangeLog.html"
 
+# Meson: distribute in tarballs. The first variable is more reliable, but requires Meson 0.58.
+# Fallback to the older one if necessary
+# shellcheck disable=SC2154
+for distdir in "$MESON_PROJECT_DIST_ROOT" "$MESON_DIST_ROOT"; do
+    if [ -n "$distdir" ]; then
+        cp -f "$builddir/ChangeLog.html" "$distdir/ChangeLog.html"
+        cp -f "$builddir/ChangeLog" "$distdir/ChangeLog"
+        break
+    fi
+done
+
 exit 0