X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fpackage.mk;h=079e4f6a530c2f466db44329dd88c4b48bd8e703;hp=1868ca07fd276de5f72c783d9080bbb8253a910d;hb=74e1368d4688ee16f6decdf2cd3ebe27506b26ba;hpb=529e082c015a9bed835b2a223296f0a658d44c8e

diff --git a/mk/package.mk b/mk/package.mk
index 1868ca0..079e4f6 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -140,6 +140,7 @@ ifeq "$(NON_HS_PACKAGE)" ""
 SRC_HC_OPTS	+= -XGenerics
 endif
 
+ifndef DONT_WANT_STD_LIBRARY
 ifndef LIBRARY
 ifeq "$(_way:%_dyn=YES)" "YES"
 LIBRARY      	= libHS$(PACKAGE)$(_way:%_dyn=%)-ghc$(ProjectVersion)$(soext)
@@ -147,11 +148,13 @@ else
 LIBRARY      	= libHS$(PACKAGE)$(_way).a
 endif
 endif
+endif
 
 ifeq "$(WAYS)" ""
 WAYS = $(GhcLibWays)
 endif
 
+ifdef LIBRARY
 all :: $(LIBRARY)
 
 # POSSIBLE alternative version using --make:
@@ -176,6 +179,7 @@ ifeq "$(DLLized)" "YES"
 INSTALL_PROGS += $(DLL_NAME)
 INSTALL_LIBS += $(patsubst %.a,%_imp.a, $(LIBRARY))
 endif
+endif
 
 # The interface files are put inside the $(libdir), since they
 # might (potentially) be platform specific..
@@ -270,13 +274,6 @@ ifneq "$(HS_PPS)" ""
 
 CLEAN_FILES += $(HS_PPS) $(addsuffix .tmp, $(HS_SRCS))
 
-ifeq "$(HADDOCK)" ""
-html ::
-	@echo Haddock must be installed in order to build HTML library documentation.
-	@echo Please install Haddock and re-configure.
-	@exit 1
-endif
-
 html :: $(HTML_DOC)
 
 extraclean ::