* 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

diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index cb57799352a1c88ced54bcf89a22bc0d04e8f068..5e60a0d759bd56e6a428cdbb3ae3f6428988bb3f 100644 (file)
--- 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 e534a478f18ad2141c6d7de0a640afaf1d488023..a086450fa4ea0e678668d7c7f136d939a477eade 100644 (file)
--- 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."