svn rev #23727: branches/krb5-1-8/src/util/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23727
Commit By: tlyu
Log Message:
ticket: 6663
version_fixed: 1.8
status: resolved

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.


Changed Files:
U   branches/krb5-1-8/src/util/mkrel
Modified: branches/krb5-1-8/src/util/mkrel
===================================================================
--- branches/krb5-1-8/src/util/mkrel	2010-02-16 22:41:27 UTC (rev 23726)
+++ branches/krb5-1-8/src/util/mkrel	2010-02-16 23:01:30 UTC (rev 23727)
@@ -200,6 +200,12 @@
 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 @@
 
 		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