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

diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index
index de20186..db84b1d 100644
--- a/libraries/gen_contents_index
+++ b/libraries/gen_contents_index
@@ -7,33 +7,27 @@ NAMES=
 
 case $* in
 --inplace)
-    GHC_PKG=../utils/ghc-pkg/ghc-pkg-inplace
-    for DIR in */
-    do
-        NAME=`echo "$DIR" | sed 's#/$##'`
-        HADDOCK_FILE=$NAME/dist/doc/html/$NAME/$NAME.haddock
-        if [ -f $HADDOCK_FILE ]
-        then
-            HADDOCK_ARGS="$HADDOCK_ARGS --read-interface=$NAME,$HADDOCK_FILE"
-            NAMES="$NAMES $NAME"
-        fi
-    done
+    HADDOCK=../utils/haddock/install-inplace/bin/haddock
+    HADDOCK_FILES=`ls -1 */dist/doc/html/*/*.haddock | sort`
     ;;
 *)
-    HADDOCK_FILES=`ls -1 */*.haddock | sort`
-    for HADDOCK_FILE in $HADDOCK_FILES
-    do
-        NAME=`echo "$HADDOCK_FILE" | sed "s#/.*##"`
-        HADDOCK_ARGS="$HADDOCK_ARGS --read-interface=$NAME,$HADDOCK_FILE"
-        NAMES="$NAMES $NAME"
-    done
+    HADDOCK=../../../../bin/haddock
+    # We don't want the GHC API to swamp the index
+    HADDOCK_FILES=`ls -1 */*.haddock | grep -v "ghc/" | sort`
     ;;
 esac
 
+for HADDOCK_FILE in $HADDOCK_FILES
+do
+    NAME=`echo "$HADDOCK_FILE" | sed 's#/.*##'`
+    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" \
-        $HADDOCK_ARGS
+$HADDOCK --gen-index --gen-contents -o . \
+         -t "Haskell Hierarchical Libraries" \
+         $HADDOCK_ARGS
 
 # Unhandled Windows help stuff?: