From: Ian Lynagh <igloo@earth.li>
Date: Sun, 24 Aug 2008 17:51:06 +0000 (+0000)
Subject: Fix the "have we got all the bootlibs" check
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=1d397231bcb9aa87e1781b728f2a848b4052481f

Fix the "have we got all the bootlibs" check
The packages file has an extra component (for "darcs" or "git") so we need
to take that into account when grepping.
---

diff --git a/Makefile b/Makefile
index d5b925d..471ac1a 100644
--- a/Makefile
+++ b/Makefile
@@ -88,7 +88,7 @@ endif
 # Sanity check that all the boot libraries are in the tree, to catch
 # failure to run darcs-all.
 check-packages :
-	@ds=`grep "^[^# ][^ ]*  *[^ ][^ ]*$$" packages | sed "s/ .*//"`;\
+	@ds=`grep "^[^# ][^ ]*  *[^ ][^ ]*  *[^ ][^ ]*$$" packages | sed "s/ .*//"`;\
 	for d in $$ds; do \
 	  if test ! -d $$d; then \
 	     echo "Looks like you're missing $$d,"; \
diff --git a/boot b/boot
index 9c1fad7..ba02e70 100644
--- a/boot
+++ b/boot
@@ -2,7 +2,7 @@
 set -e
 
 # 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
     then