X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=boot-pkgs;h=017705b62c68504feceeb5197d23d0bd140fc789;hb=3c2a7fa6cf118f6e0fbda8babac7aff988574384;hp=e8bcab9b9bfee4a9dd9328f11cb44e001e101c70;hpb=f7321bb96230d48d0eb2920c54d27ef59c571716;p=ghc-hetmet.git

diff --git a/boot-pkgs b/boot-pkgs
index e8bcab9..017705b 100644
--- a/boot-pkgs
+++ b/boot-pkgs
@@ -3,7 +3,9 @@ set -e
 
 libraries=
 
-tarred=`ls -1 libraries/tarballs | sed "s/-[0-9.]*.tar.gz//"`
+# We do the sed in 3 steps, as the -snapshot may or may not be there,
+# and I can't see a way to optionally match it with POSIX BREs
+tarred=`ls -1 libraries/tarballs | sed -e 's/\.tar\.gz$//' -e 's/-snapshot$//' -e 's/-[0-9.]*$//'`
 
 for p in $tarred
 do
@@ -22,7 +24,7 @@ do
             mkdir "libraries/$p"
             (
                 cd "libraries/$p"
-                tar -zxf ../../$tarball
+                cat ../../$tarball | gzip -d | tar xf -
                 mv */* .
             )
             touch "$stamp"
@@ -53,7 +55,7 @@ for f in $libraries; do
        else
            stage=1
        fi
-       top=`echo $f | sed 's#[^/]\+#..#g'`
+       top=`echo $f | sed 's#[^/][^/]*#..#g'`
        echo "${f}_PACKAGE = ${pkg}" >> $f/ghc.mk
        echo "${f}_dist-install_GROUP = libraries" >> $f/ghc.mk
        echo "\$(eval \$(call build-package,${f},dist-install,${stage}))" >> $f/ghc.mk