From: Tom Yu <tlyu@mit.edu>
Date: Tue, 16 Feb 2010 23:01:30 +0000 (+0000)
Subject: pull up r23726 from trunk
X-Git-Tag: krb5-1.8-beta1~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=590d8b0389b67b121b9f6677a866f6a7421f4d15;p=krb5.git

pull up r23726 from trunk

 ------------------------------------------------------------------------
 r23726 | tlyu | 2010-02-16 17:41:27 -0500 (Tue, 16 Feb 2010) | 8 lines

 ticket: 6663
 subject: update mkrel to deal with changed source layout
 target_version: 1.8
 tags: pullup

 Update mkrel so it deals somewhat better with removed src/lib/des425,
 NOTICES, etc.

ticket: 6663
version_fixed: 1.8
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@23727 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/util/mkrel b/src/util/mkrel
index ca9108767..8d00357bd 100755
--- a/src/util/mkrel
+++ b/src/util/mkrel
@@ -200,6 +200,12 @@ fi
 echo "Generating tarfiles..."
 GZIP=-9; export GZIP
 if test $multitar = t; then
+	if test -d $reldir/src/lib/des425; then
+		des425=$reldir/src/lib/des425
+	fi
+	if test -f $reldir/NOTICE;
+		then notice=$reldir/NOTICE
+	fi
 	if test $dosrc = t; then
 		gtar --exclude $reldir/src/lib/crypto \
 			--exclude $reldir/src/lib/des425 \
@@ -208,10 +214,10 @@ if test $multitar = t; then
 
 		gtar zcf ${reldir}.crypto.tar.gz \
 			$reldir/src/lib/crypto \
-			$reldir/src/lib/des425
+			$des425
 	fi
 	if test $dodoc = t; then
-		gtar zcf ${reldir}.doc.tar.gz $reldir/doc $reldir/README
+		gtar zcf ${reldir}.doc.tar.gz $reldir/doc $reldir/README $notice
 	fi
 	ls -l ${reldir}.*.tar.gz
 fi