[commit: ghc] ghc-7.8: Ship xhtml, terminfo, haskeline (#8919) (f31b042)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.8
Link       : http://ghc.haskell.org/trac/ghc/changeset/f31b042c25b9c51efdbe84c1cb6f65f49534c14d/ghc

>---------------------------------------------------------------

commit f31b042c25b9c51efdbe84c1cb6f65f49534c14d
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon Jun 9 08:41:36 2014 -0500

    Ship xhtml, terminfo, haskeline (#8919)
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>
    (cherry picked from commit 4caadb7cbee5c176abb99df25c4cc1657ae57f40)


>---------------------------------------------------------------

f31b042c25b9c51efdbe84c1cb6f65f49534c14d
 ghc.mk | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index eeb0d6a..67d0cbd 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -425,13 +425,6 @@ PACKAGES_STAGE2 += haskell98
 PACKAGES_STAGE2 += haskell2010
 endif
 
-# We normally install only the packages down to this point
-REGULAR_INSTALL_PACKAGES := $(addprefix libraries/,$(PACKAGES_STAGE1))
-ifeq "$(Stage1Only)" "NO"
-REGULAR_INSTALL_PACKAGES += compiler
-endif
-REGULAR_INSTALL_PACKAGES += $(addprefix libraries/,$(PACKAGES_STAGE2))
-
 PACKAGES_STAGE1 += xhtml
 ifeq "$(Windows_Target)" "NO"
 ifneq "$(TargetOS_CPP)" "ios"
@@ -440,6 +433,13 @@ endif
 endif
 PACKAGES_STAGE1 += haskeline
 
+# We normally install only the packages down to this point
+REGULAR_INSTALL_PACKAGES := $(addprefix libraries/,$(PACKAGES_STAGE1))
+ifeq "$(Stage1Only)" "NO"
+REGULAR_INSTALL_PACKAGES += compiler
+endif
+REGULAR_INSTALL_PACKAGES += $(addprefix libraries/,$(PACKAGES_STAGE2))
+
 # If we have built the programs with dynamic libraries, then
 # ghc will be dynamically linked against haskeline.so etc, so
 # we need the dynamic libraries of everything down to here