From f96ea257527704ac24b2f619018de7ed5dc7c84d Mon Sep 17 00:00:00 2001
From: Simon Marlow <marlowsd@gmail.com>
Date: Tue, 30 Mar 2010 14:27:14 +0000
Subject: [PATCH] Don't install EXTRA_PACKAGES by default

---
 ghc.mk          |    6 +++++-
 mk/config.mk.in |   10 ++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ghc.mk b/ghc.mk
index 69bb286..f8f0937 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -857,7 +857,11 @@ INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe
 INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe
 endif
 
-INSTALLED_PACKAGES = $(filter-out haskeline mtl terminfo utf8-string,$(PACKAGES))
+INSTALLED_PACKAGES := $(filter-out haskeline mtl terminfo utf8-string,$(PACKAGES))
+ifeq "$(InstallExtraPackages)" "NO"
+INSTALLED_PACKAGES := $(filter-out $(EXTRA_PACKAGES), $(INSTALLED_PACKAGES))
+endif
+
 HIDDEN_PACKAGES = binary
 
 define set_INSTALL_DISTDIR
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 111de23..8df8e21 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -302,6 +302,16 @@ SupportsSplitObjs=$(strip $(if $(filter YES,$(ArchSupportsSplitObjs)),\
 # By default, enable SplitObjs for the libraries if this build supports it
 SplitObjs=$(SupportsSplitObjs)
 
+# ----------------------------------------------------------------------------
+# Package-related things
+
+# Extra packages to add to the build, in dependency order
+EXTRA_PACKAGES =
+
+# Whether to install $(EXTRA_PACKAGES)
+InstallExtraPackages = NO
+
+# Run "ghc-pkg check" on each package
 CHECK_PACKAGES = NO
 
 # ----------------------------------------------------------------------------
-- 
1.7.10.4