projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak gen_contents_index
[ghc-hetmet.git]
/
libraries
/
gen_contents_index
diff --git
a/libraries/gen_contents_index
b/libraries/gen_contents_index
index
4ddb58a
..
db84b1d
100644
(file)
--- a/
libraries/gen_contents_index
+++ b/
libraries/gen_contents_index
@@
-7,10
+7,13
@@
NAMES=
case $* in
--inplace)
case $* in
--inplace)
+ HADDOCK=../utils/haddock/install-inplace/bin/haddock
HADDOCK_FILES=`ls -1 */dist/doc/html/*/*.haddock | sort`
;;
*)
HADDOCK_FILES=`ls -1 */dist/doc/html/*/*.haddock | sort`
;;
*)
- HADDOCK_FILES=`ls -1 */*.haddock | sort`
+ HADDOCK=../../../../bin/haddock
+ # We don't want the GHC API to swamp the index
+ HADDOCK_FILES=`ls -1 */*.haddock | grep -v "ghc/" | sort`
;;
esac
;;
esac
@@
-22,9
+25,9
@@
do
done
# Now create the combined contents and index pages
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?:
# Unhandled Windows help stuff?: