Make the integer library to use more configurable

Now you just set INTEGER_LIBRARY=integer-foo in build.mk

diff --git a/libraries/Makefile b/libraries/Makefile
index 9617dd4..53a13e6 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -38,8 +38,8 @@ show:
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS  = ghc-prim integer-gmp base array packedstring containers bytestring
-SUBDIRS += old-locale old-time filepath directory
+SUBDIRS  = ghc-prim $(INTEGER_LIBRARY) base array packedstring
+SUBDIRS += containers bytestring old-locale old-time filepath directory
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
 endif
@@ -322,7 +322,8 @@ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                                       $(CABAL_HADDOCK_FLAGS); \
        fi
 ifneq "$(HSCOLOUR)" ""
-# We use */src rather than $*/src due to the integer-gmp/integer mismatch
+# We use */src rather than $*/src due to the $(INTEGER_LIBRARY)/integer
+# mismatch
        if ifBuildable/ifBuildable $*; then cp hscolour.css $*/dist/doc/html/*/src/; fi
 endif
 

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 7d0e025..daa6d69 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -349,6 +349,9 @@ MakefileDeps=YES
 #------------------------------------------------------------------------------
 # Options for Libraries
 
+# Which directory (in libraries/) contains the integer library?
+INTEGER_LIBRARY=integer-gmp
+
 # What extra ways to build the libraries in
 # In addition to the normal sequential way, the default is to also build
 # profiled prelude libraries.