From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Thu, 18 Apr 2013 13:40:38 +0000 (-0400)
Subject: Check for any uncommitted changes in dist target and add force-dist
X-Git-Tag: SUDO_1_8_7~1^2~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc618b99115293effc711ce0f33e97685708edb4;p=sudo

Check for any uncommitted changes in dist target and add force-dist
target that omit check-dist.
---

diff --git a/Makefile.in b/Makefile.in
index ed9680330..719b2714b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -259,13 +259,16 @@ install-nls:
 
 check-dist: update-pot compile-po
 	@if [ -d .hg ]; then \
-	    if hg stat -am | grep '\.[mp]ot*$$'; then \
-		echo "Uncommitted message catalog changes" 1>&2; \
-		false; \
+	    if test `hg stat -am | wc -l` -ne 0; then \
+		echo "Uncommitted changes" 1>&2; \
+		hg stat -am 1>&2; \
+		exit 1; \
 	    fi; \
 	fi
 
-dist: check-dist ChangeLog $(srcdir)/MANIFEST
+dist: check-dist force-dist
+
+force-dist: ChangeLog $(srcdir)/MANIFEST
 	pax -w -x ustar -s '/^/$(PACKAGE_TARNAME)-$(VERSION)\//' \
 	    -f ../$(PACKAGE_TARNAME)-$(VERSION).tar \
 	    `sed 's/[ 	].*//' $(srcdir)/MANIFEST`