Updates to work with latest cabal.

diff --git a/libraries/Makefile b/libraries/Makefile
index d2e2b06..5b8447f 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -223,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) \
-                  --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) ) \

diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs
index d1ca8fa..01bde47 100644 (file)
--- a/libraries/installPackage.hs
+++ b/libraries/installPackage.hs
@@ -37,7 +37,7 @@ doit destdir pref idatadir idocdir ghcpkg ghcpkgconf verbosity =
                               copyVerbose = verbosity
                           }
               registerFlags = emptyRegisterFlags {
-                                  regUser = MaybeUserGlobal,
+                                  regPackageDB = Just GlobalPackageDB,
                                   regVerbose = verbosity,
                                   regGenScript = False,
                                   regInPlace = False