[commit: Cabal] master: Fix up the bootstrap.sh and include it in the tarball (2324167)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/2324167796bb78891f7f72fc5344448d70f407fb

>---------------------------------------------------------------

commit 2324167796bb78891f7f72fc5344448d70f407fb
Author: Duncan Coutts <duncan at haskell.org>
Date:   Tue Aug 26 21:09:23 2008 +0000

    Fix up the bootstrap.sh and include it in the tarball

>---------------------------------------------------------------

 cabal-install/bootstrap.sh        |   14 +++++++-------
 cabal-install/cabal-install.cabal |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh
index b2d240c..bf814b5 100644
--- a/cabal-install/bootstrap.sh
+++ b/cabal-install/bootstrap.sh
@@ -6,7 +6,7 @@
 # HTTP packages. It then installs cabal-install itself.
 # It expects to be run inside the cabal-install directory.
 
-CABAL_VER="1.4.0.1"
+CABAL_VER="1.4.0.2"
 HTTP_VER="3001.0.4"
 ZLIB_VER="0.4.0.4"
 
@@ -17,19 +17,19 @@ ZLIB_URL=${HACKAGE_URL}/zlib/${ZLIB_VER}/zlib-${ZLIB_VER}.tar.gz
 
 wget ${CABAL_URL} ${HTTP_URL} ${ZLIB_URL}
 
-tar -zxf Cabal-1.4.0.1.tar.gz
-pushd Cabal-1.4.0.1
+tar -zxf Cabal-${CABAL_VER}.tar.gz
+pushd Cabal-${CABAL_VER}
 ghc --make Setup
 ./Setup configure --user && ./Setup build && ./Setup install
 popd
 
-tar -zxf HTTP-3001.0.4.tar.gz
-pushd HTTP-3001.0.4
+tar -zxf HTTP-${HTTP_VER}.tar.gz
+pushd HTTP-${HTTP_VER}
 runghc Setup configure --user && runghc Setup build && runghc Setup install
 popd
 
-tar -zxf zlib-0.4.0.4.tar.gz
-pushd zlib-0.4.0.4
+tar -zxf zlib-${ZLIB_VER}.tar.gz
+pushd zlib-${ZLIB_VER}
 runghc Setup configure --user && runghc Setup build && runghc Setup install
 popd
 
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index 9aed12c..8187b50 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -21,7 +21,7 @@ Copyright:          2005 Lemmih <lemmih at gmail.com>
 Stability:          Experimental
 Category:           Distribution
 Build-type:         Simple
-Extra-Source-Files: README bash-completion/cabal
+Extra-Source-Files: README bash-completion/cabal bootstrap.sh
 Cabal-Version:      >= 1.2
 
 flag old-base