X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2Fgen_contents_index;h=1d8306416cfaa13dca1f2906661ea7e6623c4b6e;hb=debb7b80e707c343a3a7d8993ffab19b83e5c52b;hp=e189cac8ee3726a0a755988b8f2857e0d887ae5d;hpb=7f4b8d9bfbfb0556d51ba1fb25f18e424bd5bf9c;p=ghc-hetmet.git

diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index
index e189cac..1d83064 100644
--- a/libraries/gen_contents_index
+++ b/libraries/gen_contents_index
@@ -7,14 +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$##'`
-        VERSION=`grep -i '^version:' $LIBPATH/$NAME.cabal | sed 's/.*[ \t]//'`
+        # 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'`
         HADDOCK_ARG="--read-interface=${NAME}-${VERSION},$HADDOCK_FILE"
         HADDOCK_ARGS="$HADDOCK_ARGS $HADDOCK_ARG"
     done