X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2Fgen_contents_index;h=8129bebd41b470e1d96c770f53be5b006b9ccb5d;hb=2f591deaf56c0361334c1fa1081d50bd9fb58883;hp=bd628ba5513a57787e3f526e7657f11bbcebbd52;hpb=80a290e38a1d53f8db2120dc40f362e5e4498ce6;p=ghc-hetmet.git

diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index
index bd628ba..8129beb 100644
--- a/libraries/gen_contents_index
+++ b/libraries/gen_contents_index
@@ -2,40 +2,30 @@
 
 set -e
 
-if [ -e base/dist ]
-then
+HADDOCK=../utils/haddock/install-inplace/bin/haddock
+HADDOCK_ARGS=
+NAMES=
+
+case $* in
+--inplace)
     HADDOCK_FILES=`ls -1 */dist/doc/html/*/*.haddock | sort`
-else
+    ;;
+*)
     HADDOCK_FILES=`ls -1 */*.haddock | sort`
-fi
-
-# Automagically create the prologue for the combined index via a
-# header, the package prologues (in alphabetical order of the
-# packages) and a footer.
-{
-    cat libraries-header.txt
-    echo
-    # Hack to find out if we're in a build tree or installed docs
-    for HADDOCK_FILE in $HADDOCK_FILES
-    do
-        NAME=`echo "$HADDOCK_FILE" | sed "s#/.*##"`
-        if [ "$NAME" != haskell98 ]
-        then
-            echo "[@${NAME}@]"
-            grep -v '^ *$$' "$NAME"/prologue.txt
-            echo
-            HADDOCK_ARGS="$HADDOCK_ARGS --read-interface=$NAME,$HADDOCK_FILE"
-        fi
-    done
-    cat libraries-footer.txt
-    echo
-} > libraries.txt
+    ;;
+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" \
-        -p libraries.txt \
-        $HADDOCK_ARGS
+$HADDOCK --gen-index --gen-contents -o . \
+         -t "Haskell Hierarchical Libraries" \
+         $HADDOCK_ARGS
 
 # Unhandled Windows help stuff?: