X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=boot;h=43d2db5c0f1be859cca7706f8bd3d3c7e1c11f2d;hb=cadba81047f6188fad2fe07004c3cb36316c36d1;hp=0cdee985f69dfc7a3a4a41dd6b207691456d24a2;hpb=6a0424c5df63b6f84c29b1dbf6412ffaf5279a54;p=ghc-hetmet.git

diff --git a/boot b/boot
index 0cdee98..43d2db5 100644
--- a/boot
+++ b/boot
@@ -1,6 +1,9 @@
 #! /bin/sh
 set -e
 
+# Create libraries/*/{ghc.mk,GNUmakefile}
+sh boot-pkgs
+
 # Check that we have all boot packages.
 for dir in `grep "^[^# ][^ ]*  *[^ ][^ ]*  *[^ ][^ ]*$" packages | sed "s/ .*//"`
 do
@@ -30,39 +33,3 @@ do
         chmod +x $f
     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=`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,${stage}))" >> $f/ghc.mk
-       rm -f $f/GNUmakefile
-       echo "Creating $f/GNUmakefile"
-       echo "dir = ${f}" >> $f/GNUmakefile
-       echo "TOP = ${top}" >> $f/GNUmakefile
-       echo "include \$(TOP)/mk/sub-makefile.mk" >> $f/GNUmakefile
-   fi
-done