X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2Fgen_contents_index;h=2ae6bf5772211934e3255a07c3e3bab346e29434;hb=d9a2eefd17cd91e7193616d955056fddf3dab305;hp=ea9f4b95e1baff8a8f2a01eb34d228b9f857aebc;hpb=7e97bc160b6a3f3fc85098121afa110e8ad98fce;p=ghc-hetmet.git

diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index
index ea9f4b9..2ae6bf5 100644
--- a/libraries/gen_contents_index
+++ b/libraries/gen_contents_index
@@ -3,31 +3,37 @@
 set -e
 
 HADDOCK_ARGS=
-NAMES=
 
 case $* in
 --inplace)
-    HADDOCK=../utils/haddock/install-inplace/bin/haddock
-    HADDOCK_FILES=`ls -1 */dist/doc/html/*/*.haddock | sort`
-    if [ -d dph ]
-    then
-        HADDOCK_FILES="$HADDOCK_FILES `ls -1 dph/*/dist/doc/html/*/*.haddock | sort`"
-    fi
+    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
+    do
+        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 and 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"
+    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#.*/##' | sed 's#\.haddock$##' `
-    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" \