Fix creation of library doc index, and put the library docs in bindists

[ghc-hetmet.git] / libraries / gen_contents_index

diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index
index db18568..99efc8f 100644 (file)
--- a/libraries/gen_contents_index
+++ b/libraries/gen_contents_index
@@ -7,8 +7,9 @@ NAMES=
 
 case $* in
 --inplace)
-    HADDOCK=../utils/haddock/install-inplace/bin/haddock
-    HADDOCK_FILES=`ls -1 */dist/doc/html/*/*.haddock | sort`
+    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
@@ -19,7 +20,7 @@ esac
 
 for HADDOCK_FILE in $HADDOCK_FILES
 do
-    NAME=`echo "$HADDOCK_FILE" | sed 's#/.*##'`
+    NAME=` echo "$HADDOCK_FILE" | sed 's#.*/##' | sed 's#\.haddock$##' `
     HADDOCK_ARGS="$HADDOCK_ARGS --read-interface=$NAME,$HADDOCK_FILE"
     NAMES="$NAMES $NAME"
 done