]> www.infradead.org Git - pidgin-chime.git/commitdiff
Hide git error message when building from tarball
authorDavid Woodhouse <dwmw2@infradead.org>
Mon, 30 Apr 2018 11:08:19 +0000 (12:08 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Mon, 30 Apr 2018 11:08:19 +0000 (12:08 +0100)
configure.ac

index d30db909c725dc9fd0a49321be28004683b29056..f34f87d43fd1ac559b7e809fd191e36157b9e202 100644 (file)
@@ -112,7 +112,11 @@ RAWLINGUAS=`sed -e "/^#/d" -e "s/#.*//" "${srcdir}/po/LINGUAS"`
 LINGUAS=`echo $RAWLINGUAS`
 AC_SUBST(LINGUAS)
 
-if git diff --name-only --exit-code v${PACKAGE_VERSION} HEAD > /dev/null; then
+# This will fail if we're building from a tarball not a git checkout,
+# but that's probably fine for now. Although actually we should probably
+# make the specfile in autogen.sh not at configure time, and then we
+# can trust that the ones included by 'make dist' should be right.
+if git diff --name-only --exit-code v${PACKAGE_VERSION} HEAD > /dev/null 2>/dev/null; then
    gitdesc=$(git describe --tags HEAD)
    AC_SUBST(SNAPCOUNT, $(echo "$gitdesc" | cut -f2 -d-))
    AC_SUBST(SNAPCOMMIT, $(git rev-parse HEAD))