Fix source tarballs.

diff --git a/.gitattributes b/.gitattributes
index 0c203315ba1829afd6cb871d60aef4eb5bfaf22e..1a5c3e6c7b8f1bd08ae5051760131c5cc8dc92b7 100644 (file)
--- 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 ed7c05f56e0a8694f493d07723609b080e7c10de..8e6b0374eb6eec2e393f2ab131b4bc909341d543 100755 (executable)
--- 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