X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=boot;h=3cb9f6aba5514025a2e7d63ab3b5c19198ccab33;hb=80d071f68134bf3ad89d4de0d83807e2f0ec32c0;hp=d586348de75670f94f02dbd94e95003b6b1700e6;hpb=34cc75e1a62638f2833815746ebce0a9114dc26b;p=ghc-hetmet.git

diff --git a/boot b/boot
index d586348..3cb9f6a 100644
--- a/boot
+++ b/boot
@@ -31,19 +31,39 @@ do
     fi
 done
 
+libraries=
+
 for f in libraries/*; do
+  pkgs=$f/ghc-packages
+  if test -f $pkgs; then
+    for p in `cat $pkgs`; do
+      libraries="$libraries $f/$p"
+    done
+  else
+    libraries="$libraries $f"
+  fi
+done
+
+for f in $libraries; do
    dir=`basename $f`
    cabals=`echo $f/*.cabal`
    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'`
        echo "${f}_PACKAGE = ${pkg}" >> $f/ghc.mk
-       echo "\$(eval \$(call build-package,${f},dist-install,1))" >> $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"
        echo "dir = ${f}" >> $f/GNUmakefile
-       echo "TOP = ../.." >> $f/GNUmakefile
+       echo "TOP = ${top}" >> $f/GNUmakefile
        echo "include \$(TOP)/mk/sub-makefile.mk" >> $f/GNUmakefile
    fi
 done