projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updates to work with latest cabal.
[ghc-hetmet.git]
/
libraries
/
Makefile
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
8d6f8e1
..
5b8447f
100644
(file)
--- a/
libraries/Makefile
+++ b/
libraries/Makefile
@@
-88,6
+88,8
@@
space=$(empty) $(empty)
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
+libraryhtmldir = $(htmldir)/libraries
+
ifneq "$(DOING_BIN_DIST)" "YES"
CONFIGURE_OPTS =
ifneq "$(DOING_BIN_DIST)" "YES"
CONFIGURE_OPTS =
@@
-195,13
+197,10
@@
configure: $(foreach SUBDIR,$(SUBDIRS), \
# the executable with the shell script on non-Windows. This should
# probably be tidied up so that we can always pass the same libsubdir.
ifeq "$(Windows)" "YES"
# the executable with the shell script on non-Windows. This should
# probably be tidied up so that we can always pass the same libsubdir.
ifeq "$(Windows)" "YES"
-datadir = $$prefix
libsubdir = $$pkgid
else
libsubdir = $$pkgid
else
-datadir = $$prefix/share/ghc
libsubdir = $$compiler/lib/$$pkgid
endif
libsubdir = $$compiler/lib/$$pkgid
endif
-libraryhtmldir = $(htmldir)/libraries
# We rely on all the CONFIGURE_ARGS being quoted with '...', and there
# being no 's inside the values.
# We rely on all the CONFIGURE_ARGS being quoted with '...', and there
# being no 's inside the values.
@@
-224,7
+223,7
@@
stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
--with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$ \
--with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \
--with-ld=$(LD) \
--with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$ \
--with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \
--with-ld=$(LD) \
- --haddock-args="--use-contents=../index.html \
+ --haddock-options="--use-contents=../index.html \
--use-index=../doc-index.html" \
$(FLAGGED_CONFIGURE_ARGS) \
--configure-option=--with-cc=$(CC) ) \
--use-index=../doc-index.html" \
$(FLAGGED_CONFIGURE_ARGS) \
--configure-option=--with-cc=$(CC) ) \