X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=boot;h=644c6d9ea251a8bde192f9ab449ad3c6b66344d6;hp=d586348de75670f94f02dbd94e95003b6b1700e6;hb=609e7ddfb10bc04762b820e70e0487ad6c514c2e;hpb=34cc75e1a62638f2833815746ebce0a9114dc26b

diff --git a/boot b/boot
index d586348..644c6d9 100644
--- a/boot
+++ b/boot
@@ -1,9 +1,16 @@
 #! /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
+    # We would like to just check for an _darcs directory here, but in
+    # an lndir tree we avoid making _darcs directories, so it doesn't
+    # exist. We therefore require that every repo has a LICENSE file
+    # instead.
     if test ! -f $dir/LICENSE
     then
         echo "Error: $dir/LICENSE doesn't exist." >&2
@@ -30,20 +37,3 @@ do
         chmod +x $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}`
-       echo "${f}_PACKAGE = ${pkg}" >> $f/ghc.mk
-       echo "\$(eval \$(call build-package,${f},dist-install,1))" >> $f/ghc.mk
-       rm -f $f/GNUmakefile
-       echo "Creating $f/GNUmakefile"
-       echo "dir = ${f}" >> $f/GNUmakefile
-       echo "TOP = ../.." >> $f/GNUmakefile
-       echo "include \$(TOP)/mk/sub-makefile.mk" >> $f/GNUmakefile
-   fi
-done