X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=boot-pkgs;h=31ad53c5166e989669bff62ab02ad31a7bd1a86c;hp=e8bcab9b9bfee4a9dd9328f11cb44e001e101c70;hb=46c673a70fe14fe05d7160b456925b8591b5f779;hpb=f7321bb96230d48d0eb2920c54d27ef59c571716

diff --git a/boot-pkgs b/boot-pkgs
index e8bcab9..31ad53c 100644
--- a/boot-pkgs
+++ b/boot-pkgs
@@ -3,7 +3,7 @@ set -e
 
 libraries=
 
-tarred=`ls -1 libraries/tarballs | sed "s/-[0-9.]*.tar.gz//"`
+tarred=`ls -1 libraries/tarballs | sed "s/-[0-9.]*\(-snapshot\)\{0,1\}.tar.gz//"`
 
 for p in $tarred
 do
@@ -53,7 +53,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