From: Ian Lynagh <igloo@earth.li>
Date: Fri, 7 Dec 2007 18:35:38 +0000 (+0000)
Subject: Refactor gen_contents_index
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=2e7c7daef4a122f7b9d96bde5e048ef7ce0bff97

Refactor gen_contents_index
Also fixes it with Solaris's sh, spotted by Christian Maeder
---

diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index
index de20186..5cee6e3 100644
--- a/libraries/gen_contents_index
+++ b/libraries/gen_contents_index
@@ -7,29 +7,20 @@ 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_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
     ;;
 esac
 
+for HADDOCK_FILE in $HADDOCK_FILES
+do
+    NAME=`echo "$DIR" | 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" \