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

diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index
index 4ddb58a..db84b1d 100644
--- a/libraries/gen_contents_index
+++ b/libraries/gen_contents_index
@@ -7,10 +7,13 @@ NAMES=
 
 case $* in
 --inplace)
+    HADDOCK=../utils/haddock/install-inplace/bin/haddock
     HADDOCK_FILES=`ls -1 */dist/doc/html/*/*.haddock | sort`
     ;;
 *)
-    HADDOCK_FILES=`ls -1 */*.haddock | sort`
+    HADDOCK=../../../../bin/haddock
+    # We don't want the GHC API to swamp the index
+    HADDOCK_FILES=`ls -1 */*.haddock | grep -v "ghc/" | sort`
     ;;
 esac
 
@@ -22,9 +25,9 @@ do
 done
 
 # Now create the combined contents and index pages
-haddock --gen-index --gen-contents -o . \
-        -t "Haskell Hierarchical Libraries" \
-        $HADDOCK_ARGS
+$HADDOCK --gen-index --gen-contents -o . \
+         -t "Haskell Hierarchical Libraries" \
+         $HADDOCK_ARGS
 
 # Unhandled Windows help stuff?: