summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2008-08-24 17:51:06 +0000
committerIan Lynagh <igloo@earth.li>2008-08-24 17:51:06 +0000
commit1d397231bcb9aa87e1781b728f2a848b4052481f (patch)
tree8de0369abcea2a5ed07823e1ac53f6c85d61e084
parent60b50498ce499e879cd7d72f5386c1c633c692ff (diff)
downloadhaskell-1d397231bcb9aa87e1781b728f2a848b4052481f.tar.gz
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.
-rw-r--r--Makefile2
-rw-r--r--boot2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index d5b925d854..471ac1a8bf 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 9c1fad7297..ba02e70f8f 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