From: Michael R Sweet <michaelrsweet@gmail.com>
Date: Thu, 2 May 2019 15:52:15 +0000 (-0400)
Subject: Fix source tarballs.
X-Git-Tag: v2.3b8~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fcbda51bf9ca087373b762a1e6ced87d5eb84d5;p=thirdparty%2Fcups.git

Fix source tarballs.
---

diff --git a/.gitattributes b/.gitattributes
index 0c203315ba..1a5c3e6c7b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,3 @@
 .git* export-ignore
 .mailmap export-ignore
-tools export-ignore
+scripts export-ignore
diff --git a/scripts/makesrcdist b/scripts/makesrcdist
index ed7c05f56e..8e6b0374eb 100755
--- a/scripts/makesrcdist
+++ b/scripts/makesrcdist
@@ -6,16 +6,16 @@
 TMPDIR="${TMPDIR:=/tmp}"
 
 # Make sure we are running in the right directory...
-if test ! -f tools/makesrcdist; then
+if test ! -f scripts/makesrcdist; then
         echo "Run this script from the top-level CUPS source directory, e.g.:"
         echo ""
-        echo "    tools/makesrcdist $*"
+        echo "    scripts/makesrcdist $*"
         echo ""
         exit 1
 fi
 
 # See if we have local changes (other than this script...)
-if (git status | grep -v makesrcdist | grep -v testrpm | grep -q modified:); then
+if (git status | grep -v makesrcdist | grep -v makerpm | grep -q modified:); then
         echo Local changes remain:
         git status | grep -v makesrcdist | grep modified:
         exit 1