Fix the libffi Makefile

[ghc-hetmet.git] / ghc.mk

diff --git a/ghc.mk b/ghc.mk
index 816efc6..1ff9cbb 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -12,8 +12,6 @@
 
 # ToDo List.
 #
-# Before we can merge the new build system into HEAD:
-#
 #   * finish installation
 #     * other documentation
 #     * create doc index and contents
@@ -23,9 +21,6 @@
 #   * finish binary distributions
 #   * need to fix Cabal for new Windows layout, see
 #     Distribution/Simple/GHC.configureToolchain.
-#
-# Once the new build system is in HEAD, and before 6.12:
-#
 #   * separate the logic of whether to do something from the test for
 #     existence of the tool to do it. For example, rather than checking
 #     if $DIR_DOCBOOK_XSL or $XSLTPROC is "", we should have a variable
@@ -819,7 +814,7 @@ SRC_DIST_FILES += \
        aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \
        ghc.spec.in ghc.spec extra-gcc-opts.in VERSION boot ghc.mk
 
-SRC_DIST_TARBALL = ghc-$(ProjectVersion)-src.tar.bz2
+SRC_DIST_TARBALL = $(SRC_DIST_NAME)-src.tar.bz2
 
 VERSION :
        echo $(ProjectVersion) >VERSION
@@ -842,7 +837,7 @@ sdist_file = \
 .PHONY: sdist-prep
 sdist-prep :
        "$(RM)" $(RM_OPTS) -r $(SRC_DIST_DIR)
-       "$(RM)" $(SRC_DIST_NAME).tar.gz
+       "$(RM)" $(RM_OPTS) $(SRC_DIST_TARBALL)
        mkdir $(SRC_DIST_DIR)
        ( cd $(SRC_DIST_DIR) \
          && for i in $(SRC_DIST_DIRS); do mkdir $$i; (cd $$i && lndir $(TOP)/$$i ); done \