[commit: ghc] master: Build system: fix 'make sdist' (ccc5a1a)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ccc5a1a28ca49392f8c7a56b231007476aa5efa8/ghc

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

commit ccc5a1a28ca49392f8c7a56b231007476aa5efa8
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Sat Dec 19 01:01:30 2015 +0100

    Build system: fix 'make sdist'
    
    This was broken in 4905b83a2d448c65ccced385343d4e8124548a3b.
    
    libraries/ghci/ghc.mk gets created by ./boot.


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

ccc5a1a28ca49392f8c7a56b231007476aa5efa8
 ghc.mk                | 2 +-
 libraries/ghci/ghc.mk | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index ba9aead..1bd5415 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -1155,7 +1155,7 @@ SRC_DIST_TESTSUITE_TARBALL        = $(SRC_DIST_ROOT)/$(SRC_DIST_TESTSUITE_NAME).
 # Files to include in source distributions
 #
 SRC_DIST_GHC_DIRS = mk rules docs distrib bindisttest libffi includes \
-    utils docs rts compiler ghc driver libraries libffi-tarballs
+    utils docs rts compiler ghc driver libraries libffi-tarballs iserv
 SRC_DIST_GHC_FILES += \
     configure.ac config.guess config.sub configure \
     aclocal.m4 README.md ANNOUNCE HACKING.md INSTALL.md LICENSE Makefile \
diff --git a/libraries/ghci/ghc.mk b/libraries/ghci/ghc.mk
deleted file mode 100644
index dc6a891..0000000
--- a/libraries/ghci/ghc.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-libraries/ghci_PACKAGE = ghci
-libraries/ghci_dist-install_GROUP = libraries
-$(if $(filter ghci,$(PACKAGES_STAGE0)),$(eval $(call build-package,libraries/ghci,dist-boot,0)))
-$(if $(filter ghci,$(PACKAGES_STAGE1)),$(eval $(call build-package,libraries/ghci,dist-install,1)))
-$(if $(filter ghci,$(PACKAGES_STAGE2)),$(eval $(call build-package,libraries/ghci,dist-install,2)))