initialise the headers of MSG_BLACKHOLE objects properly

[ghc-hetmet.git] / boot-pkgs

diff --git a/boot-pkgs b/boot-pkgs
index 91da9a3..017705b 100644 (file)
--- a/boot-pkgs
+++ b/boot-pkgs
@@ -3,7 +3,9 @@ set -e
 
 libraries=
 
-tarred=`ls -1 libraries/tarballs | sed "s/-[0-9.]*\(-snapshot\)\{0,1\}.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