X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2Fgen_contents_index;h=04209fdb8fc70502717b1c9cf6d45b27c08ecad9;hp=e189cac8ee3726a0a755988b8f2857e0d887ae5d;hb=e5c3b478b3cd1707cf122833822f44b2ac09b8e9;hpb=7f4b8d9bfbfb0556d51ba1fb25f18e424bd5bf9c

diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index
index e189cac..04209fd 100644
--- a/libraries/gen_contents_index
+++ b/libraries/gen_contents_index
@@ -7,16 +7,19 @@ HADDOCK_ARGS=
 case $* in
 --inplace)
     HADDOCK=../inplace/bin/haddock
-    HADDOCK_FILES1=`ls -1     */dist-install/doc/html/*/*.haddock | sort`
-    HADDOCK_FILES2=`ls -1 dph/*/dist-install/doc/html/*/*.haddock | sort`
-    HADDOCK_FILES="$HADDOCK_FILES1 $HADDOCK_FILES2"
-    for HADDOCK_FILE in $HADDOCK_FILES
+    for LIB in `grep '^libraries/[^ ]*  *- ' ../packages | sed -e 's#libraries/##' -e 's/ .*//'`
     do
-        LIBPATH=`echo "$HADDOCK_FILE" | sed 's#/dist-install.*##'`
-        NAME=`echo "$HADDOCK_FILE" | sed 's#.*/##' | sed 's#\.haddock$##'`
-        VERSION=`grep -i '^version:' $LIBPATH/$NAME.cabal | sed 's/.*[ \t]//'`
-        HADDOCK_ARG="--read-interface=${NAME}-${VERSION},$HADDOCK_FILE"
-        HADDOCK_ARGS="$HADDOCK_ARGS $HADDOCK_ARG"
+        HADDOCK_FILE="$LIB/dist-install/doc/html/$LIB/$LIB.haddock"
+        if [ -f "$HADDOCK_FILE" ]
+        then
+            LIBPATH=`echo "$HADDOCK_FILE" | sed 's#/dist-install.*##'`
+            NAME=`echo "$HADDOCK_FILE" | sed 's#.*/##' | sed 's#\.haddock$##'`
+            # It's easier to portably remove tabs with tr than to try to get
+            # sed to do what we want
+            VERSION=`grep -i '^version:' $LIBPATH/$NAME.cabal | sed 's/.*://' | tr -d ' \t'`
+            HADDOCK_ARG="--read-interface=${NAME}-${VERSION},$HADDOCK_FILE"
+            HADDOCK_ARGS="$HADDOCK_ARGS $HADDOCK_ARG"
+        fi
     done
     ;;
 *)