X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=boot;h=43d2db5c0f1be859cca7706f8bd3d3c7e1c11f2d;hb=4fa44a3ae9c36222ccb460ba3ed24e46bf7c70ae;hp=9c1fad7297ce683344c3dcfcb951df5c0b0c2752;hpb=334e082ac8b94353328ee45da8bcf5fad85a29eb;p=ghc-hetmet.git

diff --git a/boot b/boot
index 9c1fad7..43d2db5 100644
--- a/boot
+++ b/boot
@@ -1,12 +1,15 @@
 #! /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/ .*//"`
+for dir in `grep "^[^# ][^ ]*  *[^ ][^ ]*  *[^ ][^ ]*$" packages | sed "s/ .*//"`
 do
-    if test ! -d $dir
+    if test ! -f $dir/LICENSE
     then
-        echo "Looks like you're missing libraries/$dir." >&2
+        echo "Error: $dir/LICENSE doesn't exist." >&2
         echo "Maybe you haven't done './darcs-all get'?" >&2
         exit 1
     fi
@@ -25,6 +28,8 @@ done
 # Alas, darcs doesn't handle file permissions, so fix a few of them.
 for f in boot darcs-all push-all validate
 do
-    test -f $f && chmod +x $f
+    if test -f $f
+    then
+        chmod +x $f
+    fi
 done
-