X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2Fgen_contents_index;h=99efc8fcc605d23cd6a2a3cbae09ad619bb77dc5;hb=eb4427afd02f653087fa3d2720193b625b6411ee;hp=2f33fc4fc485496869473403de4e08270bbb2d04;hpb=9c57dc586394c178c848ee8fb5618a2cb807912e;p=ghc-hetmet.git

diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index
index 2f33fc4..99efc8f 100644
--- a/libraries/gen_contents_index
+++ b/libraries/gen_contents_index
@@ -7,12 +7,9 @@ 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_FILES=`ls -1 */dist-install/doc/html/*/*.haddock | sort`
+    HADDOCK_FILES="$HADDOCK_FILES `ls -1 dph/*/dist-install/doc/html/*/*.haddock | sort`"
     ;;
 *)
     HADDOCK=../../../../bin/haddock
@@ -23,7 +20,7 @@ esac
 
 for HADDOCK_FILE in $HADDOCK_FILES
 do
-    NAME=` echo "$HADDOCK_FILE" | sed 's#/dist/.*##' | sed 's#.*/##' `
+    NAME=` echo "$HADDOCK_FILE" | sed 's#.*/##' | sed 's#\.haddock$##' `
     HADDOCK_ARGS="$HADDOCK_ARGS --read-interface=$NAME,$HADDOCK_FILE"
     NAMES="$NAMES $NAME"
 done