Give a better error message when we try to print a value of unknown type

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index c405f4f..f6e0f29 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -150,6 +150,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
                             --with-ld=$(LD) \
                             --datasubdir=ghc \
                             --haddock-args="--use-contents=../index.html --use-index=../doc-index.html" \
+                            $(addprefix --configure-option=,$(CONFIGURE_ARGS)) \
                             --configure-option=--with-cc=$(CC)
        touch $@
 
@@ -170,7 +171,7 @@ doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
 $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
 doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                %/setup/Setup
-       cd $* && setup/Setup haddock
+       cd $* && ../ifBuildable/ifBuildable setup/Setup haddock
 
 .PHONY: install install-docs install.library.%