pull up r18475 from trunk

 r18475@cathode-dark-space:  tlyu | 2006-08-21 16:31:51 -0400
 ticket: new
 subject: clean up mkrel patchlevel.h editing etc.
 tags: pullup
 target_version: 1.5.1

 	* src/util/mkrel: Be more careful editing KRB5_RELDATE.  Delete
 	'$ac_config_fragdir' autoconf droppings.

ticket: 4168
version_fixed: 1.5.1

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

diff --git a/src/util/mkrel b/src/util/mkrel
index 2384b7dee0b9d43cfc4fd2a4567673e13b731b76..ca91087671e16b0a2e8b27ba1b83b678838a2ebe 100755 (executable)
--- a/src/util/mkrel
+++ b/src/util/mkrel
@@ -143,7 +143,7 @@ echo "Editing release-specific files..."
 
 if test $newstyle = t; then 
        (cd $reldir/src && \
-               sed -e '/RELDATE/c\
+               sed -e '/#[a-z  ]*KRB5_RELDATE/c\
 #define KRB5_RELDATE "'"$reldate"'"' patchlevel.h > patchlevel.h.new && \
                mv patchlevel.h.new patchlevel.h)
        if test $checkout = t; then
@@ -189,7 +189,8 @@ echo "Nuking unneeded files..."
 find $reldir \( -name TODO -o -name todo -o -name .cvsignore \
        -o -name BADSYMS -o -name .Sanitize -o -name .rconf \) -print \
        | xargs rm -f || true
-find $reldir -type d \( -name autom4te.cache -o -name .svn \) -exec rm -rf {} \; || true
+find $reldir -type d \( -name autom4te.cache -o -name .svn \
+       -o -name \$ac_config_fragdir \) -exec rm -rf {} \; || true
 
 if test $dodoc = t; then
        echo "Building doc..."