Updated

diff --git a/ChangeLog b/ChangeLog
index fac3830a567ac2f4951df7e83b591e26b66457f2..e1e7fa4548bf08c5fa0efd350e3f610edd8e22ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-17  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
+
+       * README-alpha: Updated
+       * bootstrap: Updated
+
 2003-09-17  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
        * README-alpha: Updated

diff --git a/README-alpha b/README-alpha
index 605f2a7956866928a2d3eefaee10de2563f20d86..c660ca7ac22a15477115c519f20404d73bc3f8e7 100644 (file)
--- a/README-alpha
+++ b/README-alpha
@@ -4,12 +4,13 @@ This is a *pre-release* version, and not ready for production use yet.
 Please send comments and problem reports to <bug-tar@gnu.org>.
 
 If you have taken the sources from CVS you will need the following packages
-to build the package:
+to build GNU tar:
 
 autoconf 2.57
 automake 1.7.5
 bison 1.875
 gettext 0.12.1
+sed 3.0
 wget 1.7
 
 Before building the package, run bootstrap. You will need a POSIX

diff --git a/bootstrap b/bootstrap
index 35474081b870192fd3b076d2150d85514942ff4d..4fd76d369c80223039c4d058e9585087b3266d14 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -41,6 +41,8 @@ for option; do
   esac
 done
 
+echo "$0: Bootstrapping CVS tar..."
+
 build_cvs_prefix() {
   CVS_PREFIX=:${1}:
   if [ "${2}" != - ]; then
@@ -48,35 +50,32 @@ build_cvs_prefix() {
   fi
 }
 
-case "${CVS_AUTH--}" in
--)       : ${CVS_RSH:?}
-         CVS_PREFIX="";;
-pserver) build_cvs_prefix $CVS_AUTH ${CVS_USER:-anoncvs};;
-gserver|server)
-         build_cvs_prefix $CVS_AUTH ${CVS_USER--};;
-ext)     : ${CVS_RSH:?}
-         build_cvs_prefix $CVS_AUTH ${CVS_USER--};;
-*)       echo "$0: Unknown CVS access method" >&2
-         exit 1;;
-esac
-
-echo "$0: Bootstrapping CVS tar..."
-
-
 # Get gnulib files.
 
-echo "$0: getting gnulib files..."
-
 case ${GNULIB_SRCDIR--} in
 -)
   if [ ! -d gnulib ]; then
+    echo "$0: getting gnulib files..."
+
     trap exit 1 2 13 15
     trap 'rm -fr gnulib; exit 1' 0
     
+    case "${CVS_AUTH--}" in
+    -)       : ${CVS_RSH:?}
+             CVS_PREFIX="";;
+    pserver) build_cvs_prefix $CVS_AUTH ${CVS_USER:-anoncvs};;
+    gserver|server)
+             build_cvs_prefix $CVS_AUTH ${CVS_USER--};;
+    ext)     : ${CVS_RSH:?}
+             build_cvs_prefix $CVS_AUTH ${CVS_USER--};;
+    *)       echo "$0: Unknown CVS access method" >&2
+             exit 1;;
+    esac
     if [ "${CVS_AUTH--}" = "pserver" ]; then
       cvs -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib login || exit
     fi
-    cvs -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib co gnulib  || exit
+    cvs -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib co gnulib || exit
+
     trap 0
   fi
   GNULIB_SRCDIR=gnulib