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

diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index
index db18568..04209fd 100644
--- a/libraries/gen_contents_index
+++ b/libraries/gen_contents_index
@@ -3,27 +3,38 @@
 set -e
 
 HADDOCK_ARGS=
-NAMES=
 
 case $* in
 --inplace)
-    HADDOCK=../utils/haddock/install-inplace/bin/haddock
-    HADDOCK_FILES=`ls -1 */dist/doc/html/*/*.haddock | sort`
+    HADDOCK=../inplace/bin/haddock
+    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" ]
+        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
     ;;
 *)
-    HADDOCK=../../../../bin/haddock
+    HADDOCK=../../../../../bin/haddock
     # We don't want the GHC API to swamp the index
-    HADDOCK_FILES=`ls -1 */*.haddock | grep -v "ghc/" | sort`
+    HADDOCK_FILES=`ls -1 */*.haddock | grep -v '/ghc\.haddock' | sort`
+    for HADDOCK_FILE in $HADDOCK_FILES
+    do
+        NAME_VERSION=`echo "$HADDOCK_FILE" | sed 's#/.*##'`
+        HADDOCK_ARG="--read-interface=${NAME_VERSION},$HADDOCK_FILE"
+        HADDOCK_ARGS="$HADDOCK_ARGS $HADDOCK_ARG"
+    done
     ;;
 esac
 
-for HADDOCK_FILE in $HADDOCK_FILES
-do
-    NAME=`echo "$HADDOCK_FILE" | sed 's#/.*##'`
-    HADDOCK_ARGS="$HADDOCK_ARGS --read-interface=$NAME,$HADDOCK_FILE"
-    NAMES="$NAMES $NAME"
-done
-
 # Now create the combined contents and index pages
 $HADDOCK --gen-index --gen-contents -o . \
          -t "Haskell Hierarchical Libraries" \