Improve error reporting for kind errors (fix Trac #1633)

[ghc-hetmet.git] / boot

diff --git a/boot b/boot
index 2c2d88b..3cb9f6a 100644 (file)
--- a/boot
+++ b/boot
@@ -50,14 +50,15 @@ for f in $libraries; do
    if test -f $cabals; then
        echo "Creating $f/ghc.mk"
        rm -f $f/ghc.mk
-       pkg=`basename ${cabals%.cabal}`
+       pkg=`echo "$cabals" | sed -e 's#.*/##' -e 's#\.cabal$##'`
        if test -f $f/ghc-stage; then
            stage=`cat $f/ghc-stage`
        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
        rm -f $f/GNUmakefile
        echo "Creating $f/GNUmakefile"