X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=boot;h=644c6d9ea251a8bde192f9ab449ad3c6b66344d6;hp=9c1fad7297ce683344c3dcfcb951df5c0b0c2752;hb=2662dbc5b2c30fc11ccb99e7f9b2dba794d680ba;hpb=334e082ac8b94353328ee45da8bcf5fad85a29eb

diff --git a/boot b/boot
index 9c1fad7..644c6d9 100644
--- a/boot
+++ b/boot
@@ -1,12 +1,19 @@
 #! /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
+    # 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 "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 +32,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
-