[commit: testsuite] master: Fix for Windows, and delete the .mk file if ghc-config fails (ae95899)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/ae9589901500106f80eb44f860bb92d9ab6dfb7f

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

commit ae9589901500106f80eb44f860bb92d9ab6dfb7f
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Jan 20 10:49:22 2012 +0000

    Fix for Windows, and delete the .mk file if ghc-config fails

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

 mk/boilerplate.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index dd5be68..bac5e3b 100644
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -140,10 +140,10 @@ $(TOP_ABS)/mk/ghc-config : $(TOP_ABS)/mk/ghc-config.hs
 
 empty=
 space=$(empty) $(empty)
-ghc-config-mk = $(TOP_ABS)/mk/ghcconfig$(subst $(space),_,$(subst /,_,$(subst \,_,$(TEST_HC)))).mk
+ghc-config-mk = $(TOP_ABS)/mk/ghcconfig$(subst :,_,$(subst $(space),_,$(subst /,_,$(subst \,_,$(TEST_HC))))).mk
 
 $(ghc-config-mk) : $(TOP_ABS)/mk/ghc-config
-	$(TOP_ABS)/mk/ghc-config "$(TEST_HC)" >"$@" || $(RM) "$@"
+	$(TOP_ABS)/mk/ghc-config "$(TEST_HC)" >"$@"; if [ $$? != 0 ]; then $(RM) -f "$@"; exit 1; fi
 
 include $(ghc-config-mk)