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

diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index
index bd628ba..de20186 100644
--- a/libraries/gen_contents_index
+++ b/libraries/gen_contents_index
@@ -2,39 +2,37 @@
 
 set -e
 
-if [ -e base/dist ]
-then
-    HADDOCK_FILES=`ls -1 */dist/doc/html/*/*.haddock | sort`
-else
-    HADDOCK_FILES=`ls -1 */*.haddock | sort`
-fi
+HADDOCK_ARGS=
+NAMES=
 
-# 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
+case $* in
+--inplace)
+    GHC_PKG=../utils/ghc-pkg/ghc-pkg-inplace
+    for DIR in */
     do
-        NAME=`echo "$HADDOCK_FILE" | sed "s#/.*##"`
-        if [ "$NAME" != haskell98 ]
+        NAME=`echo "$DIR" | sed 's#/$##'`
+        HADDOCK_FILE=$NAME/dist/doc/html/$NAME/$NAME.haddock
+        if [ -f $HADDOCK_FILE ]
         then
-            echo "[@${NAME}@]"
-            grep -v '^ *$$' "$NAME"/prologue.txt
-            echo
             HADDOCK_ARGS="$HADDOCK_ARGS --read-interface=$NAME,$HADDOCK_FILE"
+            NAMES="$NAMES $NAME"
         fi
     done
-    cat libraries-footer.txt
-    echo
-} > libraries.txt
+    ;;
+*)
+    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
+    ;;
+esac
 
 # Now create the combined contents and index pages
 haddock --gen-index --gen-contents -o . \
         -t "Haskell Hierarchical Libraries" \
-        -p libraries.txt \
         $HADDOCK_ARGS
 
 # Unhandled Windows help stuff?: