From: Tom Yu <tlyu@mit.edu>
Date: Mon, 26 Jun 2006 02:53:21 +0000 (+0000)
Subject: pull up r18204 from trunk
X-Git-Tag: krb5-1.5-beta2~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5506970add9c35d1b7d5fd750a7b75e51d2add68;p=krb5.git

pull up r18204 from trunk

 r18204@cathode-dark-space:  tlyu | 2006-06-22 16:06:45 -0400
 ticket: 3922
 tags: pullup

 	* src/util/mkrel: Edit patchlevel.h before running reconf.


ticket: 3922
version_fixed: 1.5

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

diff --git a/src/util/mkrel b/src/util/mkrel
index 51d47afc9..f540aa3c8 100755
--- a/src/util/mkrel
+++ b/src/util/mkrel
@@ -139,22 +139,6 @@ if test $checkout = t; then
 	svn export $repository/$reltag $reldir
 fi
 
-if test $dosrc = t; then
-	if test -d $reldir/src/util/autoconf; then
-		echo "Building autoconf..."
-		(cd $reldir/src/util/autoconf
-			M4=gm4 ./configure
-			make)
-	fi
-	echo "Creating configure scripts..."
-	(cd $reldir/src; util/reconf)
-
-	if test -d $reldir/src/util/autoconf; then
-		echo "Cleaning src/util/autoconf..."
-		(cd $reldir/src/util/autoconf; make distclean)
-	fi
-fi
-
 echo "Editing release-specific files..."
 
 if test $newstyle = t; then 
@@ -182,6 +166,22 @@ EOF
 	)
 fi
 
+if test $dosrc = t; then
+	if test -d $reldir/src/util/autoconf; then
+		echo "Building autoconf..."
+		(cd $reldir/src/util/autoconf
+			M4=gm4 ./configure
+			make)
+	fi
+	echo "Creating configure scripts..."
+	(cd $reldir/src; util/reconf)
+
+	if test -d $reldir/src/util/autoconf; then
+		echo "Cleaning src/util/autoconf..."
+		(cd $reldir/src/util/autoconf; make distclean)
+	fi
+fi
+
 echo "Nuking unneeded files..."
 find $reldir \( -name TODO -o -name todo -o -name .cvsignore \
 	-o -name BADSYMS -o -name .Sanitize -o -name .rconf \) -print \