From b556bada8946fa2d0754b03af82d9eb1c9912884 Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Fri, 6 Apr 2001 02:05:14 +0000
Subject: [PATCH] 	* mkrel: When generating multiple tarballs, also
 generate a 	consolidated tarball.  Default to making a single 
 tarball. [pullups from krb5-1-2-2-branch]

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13146 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/util/ChangeLog |  6 ++++++
 src/util/mkrel     | 34 ++++++++++++++++++++--------------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index cb5779935..5e60a0d75 100644
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-05  Tom Yu  <tlyu@mit.edu>
+
+	* mkrel: When generating multiple tarballs, also generate a
+	consolidated tarball.  Default to making a single
+	tarball. [pullups from krb5-1-2-2-branch]
+
 2001-01-28  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Remove rule for aix.bincmds; we don't need it
diff --git a/src/util/mkrel b/src/util/mkrel
index e534a478f..a086450fa 100644
--- a/src/util/mkrel
+++ b/src/util/mkrel
@@ -3,12 +3,15 @@ repository=:kserver:cvs.mit.edu:/cvs/krbdev
 dodoc=t
 dosrc=t
 checkout=t
+multitar=nil
 while test $# -gt 2; do
 	case $1 in
 	--srconly)
 		dodoc=nil;;
 	--doconly)
 		dosrc=nil;;
+	--multi*)
+		multitar=t;;
 	--repository)
 		shift; repository=$1;;
 	--nocheckout)
@@ -136,22 +139,25 @@ fi
 
 echo "Generating tarfiles..."
 GZIP=-9; export GZIP
-if test $dosrc = t; then
-	gtar --exclude $reldir/src/lib/crypto \
-		--exclude $reldir/src/lib/des425 \
-		--exclude $reldir/doc \
-		-zcf ${reldir}.src.tar.gz $reldir
-
-	gtar zcf ${reldir}.crypto.tar.gz \
-		$reldir/src/lib/crypto \
-		$reldir/src/lib/des425
-fi
-
-if test $dodoc = t; then
-	gtar zcf ${reldir}.doc.tar.gz $reldir/doc $reldir/README
+if test $multitar = t; then
+	if test $dosrc = t; then
+		gtar --exclude $reldir/src/lib/crypto \
+			--exclude $reldir/src/lib/des425 \
+			--exclude $reldir/doc \
+			-zcf ${reldir}.src.tar.gz $reldir
+
+		gtar zcf ${reldir}.crypto.tar.gz \
+			$reldir/src/lib/crypto \
+			$reldir/src/lib/des425
+	fi
+	if test $dodoc = t; then
+		gtar zcf ${reldir}.doc.tar.gz $reldir/doc $reldir/README
+	fi
+	ls -l ${reldir}.*.tar.gz
 fi
 
-ls -l ${reldir}.*.tar.gz
+gtar zcf ${reldir}.tar.gz $reldir
+ls -l ${reldir}.tar.gz
 
 echo "Done."
 
-- 
2.26.2