From: Ian Lynagh <igloo@earth.li>
Date: Fri, 8 Apr 2011 18:48:26 +0000 (+0100)
Subject: gen_contents_index: Improve parsing of packages file
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;ds=sidebyside;h=159fdb19228cfb04c3fd871ab3f41f8ef7984b58;p=ghc-hetmet.git

gen_contents_index: Improve parsing of packages file

We are now more lenient in parsing the packages file, and
we don't use any GNUisms. Based on a patch from Matthias Kilian.
---

diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index
index fcf30e3..04209fd 100644
--- a/libraries/gen_contents_index
+++ b/libraries/gen_contents_index
@@ -7,7 +7,7 @@ HADDOCK_ARGS=
 case $* in
 --inplace)
     HADDOCK=../inplace/bin/haddock
-    for LIB in `grep '^libraries/[^ ]\+ \+- \+[^ ]\+ \+[^ ]\+ \+[^ ]\+' ../packages | sed -e 's#libraries/##' -e 's/ .*//'`
+    for LIB in `grep '^libraries/[^ ]*  *- ' ../packages | sed -e 's#libraries/##' -e 's/ .*//'`
     do
         HADDOCK_FILE="$LIB/dist-install/doc/html/$LIB/$LIB.haddock"
         if [ -f "$HADDOCK_FILE" ]