Update makesrcdist to correctly embed a copy of the TTF library.

makesrcdist

@@ -7,6 +7,10 @@
 #   ./makesrcdist [--snapshot] VERSION
 #
 
+# Save the current directory...
+basedir="$(pwd)"
+
+
 # Support "--snapshot" option...
 if test "$1" == "--snapshot"; then
     shift
@@ -15,18 +19,21 @@ else
     snapshot=0
 fi
 
-# Get version...
+
+# Get the release version...
 if test $# != 1; then
     echo "Usage: ./makesrcdist [--snapshot] VERSION"
     exit 1
 fi
 
-status=0
 version=$1
 version_major=$(echo $1 | awk -F. '{print $1}')
 version_minor=$(echo $1 | awk -F. '{print $2}')
 
+
 # Check that version number has been updated everywhere...
+status=0
+
 if test $(grep AC_INIT configure.ac | awk '{print $2}') != "[$version],"; then
     echo "Still need to update AC_INIT version in 'configure.ac'."
     status=1
@@ -78,18 +85,32 @@ if test $status = 1; then
     exit 1
 fi
 
+
 # Tag release...
 if test $snapshot = 0; then
-    echo Creating tag for release...
+    echo "Creating tag v$version for release..."
     git tag -m "Tag $version" v$version
     git push origin v$version
 fi
 
-# Make source archives...
-echo Creating pdfio-$version.tar.gz...
-git archive --format tar --prefix=pdfio-$version/ HEAD | gzip -v9 >pdfio-$version.tar.gz
-gpg --detach-sign pdfio-$version.tar.gz
 
-echo Creating pdfio-$version.zip...
-git archive --format zip --prefix=pdfio-$version/ HEAD >pdfio-$version.zip
-gpg --detach-sign pdfio-$version.zip
+# Make and sign source archives...
+echo "Exporting $version..."
+rm -rf $TMPDIR/pdfio-$version
+mkdir $TMPDIR/pdfio-$version
+git archive --format tar HEAD | (cd $TMPDIR/pdfio-$version; tar xf -)
+(cd ttf; git archive --prefix=ttf/ HEAD) | (cd $TMPDIR/pdfio-$version; tar xf -)
+cd $TMPDIR
+
+echo "Creating pdfio-$version.tar.gz..."
+tar cf - pdfio-$version | gzip -v9 >"$basedir/pdfio-$version.tar.gz"
+gpg --detach-sign "$basedir/pdfio-$version.tar.gz"
+
+echo "Creating pdfio-$version.zip..."
+zip -r "$basedir/pdfio-$version.zip" pdfio-$version
+gpg --detach-sign "$basedir/pdfio-$version.zip"
+
+
+# Clean up...
+echo "Removing temporary files..."
+rm -rf pdfio-$version