Interruptible FFI calls with pthread_kill and CancelSynchronousIO. v4

[ghc-hetmet.git] / libraries / gen_contents_index

diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index
index de5b267..1d83064 100644 (file)
--- a/libraries/gen_contents_index
+++ b/libraries/gen_contents_index
@@ -7,16 +7,19 @@ HADDOCK_ARGS=
 case $* in
 --inplace)
     HADDOCK=../inplace/bin/haddock
-    HADDOCK_FILES1=`ls -1     */dist-install/doc/html/*/*.haddock | sort`
-    HADDOCK_FILES2=`ls -1 dph/*/dist-install/doc/html/*/*.haddock | sort`
-    HADDOCK_FILES="$HADDOCK_FILES1 $HADDOCK_FILES2"
+    HADDOCK_FILES=`ls -1     */dist-install/doc/html/*/*.haddock | sort`
+    if [ -d dph ]
+    then
+        DPH_HADDOCK_FILES=`ls -1 dph/*/dist-install/doc/html/*/*.haddock | sort`
+        HADDOCK_FILES="$HADDOCK_FILES $DPH_HADDOCK_FILES"
+    fi
     for HADDOCK_FILE in $HADDOCK_FILES
     do
         LIBPATH=`echo "$HADDOCK_FILE" | sed 's#/dist-install.*##'`
         NAME=`echo "$HADDOCK_FILE" | sed 's#.*/##' | sed 's#\.haddock$##'`
         # It's easier to portably remove tabs with tr than to try to get
         # sed to do what we want
-        VERSION=`grep -i '^version:' $LIBPATH/$NAME.cabal | sed 's/.*://'` | tr -d ' \t'
+        VERSION=`grep -i '^version:' $LIBPATH/$NAME.cabal | sed 's/.*://' | tr -d ' \t'`
         HADDOCK_ARG="--read-interface=${NAME}-${VERSION},$HADDOCK_FILE"
         HADDOCK_ARGS="$HADDOCK_ARGS $HADDOCK_ARG"
     done