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

diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index
index 5cee6e3..8129beb 100644
--- a/libraries/gen_contents_index
+++ b/libraries/gen_contents_index
@@ -2,6 +2,7 @@
 
 set -e
 
+HADDOCK=../utils/haddock/install-inplace/bin/haddock
 HADDOCK_ARGS=
 NAMES=
 
@@ -16,15 +17,15 @@ esac
 
 for HADDOCK_FILE in $HADDOCK_FILES
 do
-    NAME=`echo "$DIR" | sed 's#/.*##'`
+    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" \
-        $HADDOCK_ARGS
+$HADDOCK --gen-index --gen-contents -o . \
+         -t "Haskell Hierarchical Libraries" \
+         $HADDOCK_ARGS
 
 # Unhandled Windows help stuff?: