X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2Fgen_contents_index;h=ea9f4b95e1baff8a8f2a01eb34d228b9f857aebc;hb=988bfabb5e8a3a743d03e57f2f25ca1008c6e6f1;hp=db84b1d2d26e63bfb93d314bb9314f8d112e82db;hpb=8c17464792ffb151907bfbff52242361ac84701a;p=ghc-hetmet.git

diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index
index db84b1d..ea9f4b9 100644
--- a/libraries/gen_contents_index
+++ b/libraries/gen_contents_index
@@ -9,6 +9,10 @@ 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=../../../../bin/haddock
@@ -19,7 +23,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
@@ -27,6 +31,7 @@ done
 # Now create the combined contents and index pages
 $HADDOCK --gen-index --gen-contents -o . \
          -t "Haskell Hierarchical Libraries" \
+         -p "prologue.txt" \
          $HADDOCK_ARGS
 
 # Unhandled Windows help stuff?: