pull up r25395 from trunk

[krb5.git] / src / util / mkrel

diff --git a/src/util/mkrel b/src/util/mkrel
index 51d47afc924f7da38ce9e5a0d4751c919372c9bf..0f07dd3975fdc074739e5a4c1e83eaf0afac6389 100755 (executable)
--- a/src/util/mkrel
+++ b/src/util/mkrel
@@ -5,6 +5,7 @@ dodoc=t
 dosrc=t
 checkout=t
 multitar=nil
+: ${TAR=tar}
 while test $# -gt 2; do
        case $1 in
        --srconly)
@@ -139,29 +140,16 @@ 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 
        (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
+               (cd $reldir && svn log -v $repository/$reltag > doc/CHANGES)
+       fi
 else
 
        (cd $reldir/src/lib/krb5/krb && \
@@ -182,11 +170,28 @@ 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 \
        | 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..."
@@ -196,23 +201,29 @@ 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 \
+               $TAR --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 \
+               $TAR 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
+               $TAR zcf ${reldir}.doc.tar.gz $reldir/doc $reldir/README $notice
        fi
        ls -l ${reldir}.*.tar.gz
 fi
 
-gtar zcf ${reldir}.tar.gz $reldir
+$TAR zcf ${reldir}.tar.gz $reldir
 ls -l ${reldir}.tar.gz
 
 echo "Done."