[commit: ghc] master: Fix path to touch on Windows (b5dc188)

[Ian Lynagh]

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

On branch  : master

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

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

commit b5dc188b9b433c803a3aef824b31191aaadefe44
Author: Ian Lynagh <igloo at earth.li>
Date:   Thu Jun 23 12:50:34 2011 +0100

    Fix path to touch on Windows

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

 aclocal.m4      |    2 +-
 compiler/ghc.mk |    4 ----
 2 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 4a2a354..2e9764c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -115,7 +115,7 @@ AC_DEFUN([FP_SETTINGS],
         SettingsPerlCommand='$topdir/../perl/perl.exe'
         SettingsDllWrapCommand='$topdir/../mingw/bin/dllwrap.exe'
         SettingsWindresCommand='$topdir/../mingw/bin/windres.exe'
-        SettingsTouchCommand='$topdir/touch.exe'
+        SettingsTouchCommand='$topdir/touchy.exe'
     else
         SettingsCCompilerCommand="$WhatGccIsCalled"
         SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2"
diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index cf75447..1a7fa07 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -102,10 +102,6 @@ compiler/stage%/build/Config.hs : mk/config.mk mk/project.mk | $$(dir $$@)/.
 	@echo 'cLD_X                 = "$(LD_X)"'                           >> $@
 	@echo 'cGHC_DRIVER_DIR       :: String'                             >> $@
 	@echo 'cGHC_DRIVER_DIR       = "$(GHC_DRIVER_DIR)"'                 >> $@
-	@echo 'cGHC_TOUCHY_PGM       :: String'                             >> $@
-	@echo 'cGHC_TOUCHY_PGM       = "$(GHC_TOUCHY_PGM)"'                 >> $@
-	@echo 'cGHC_TOUCHY_DIR       :: String'                             >> $@
-	@echo 'cGHC_TOUCHY_DIR       = "$(GHC_TOUCHY_DIR)"'                 >> $@
 	@echo 'cGHC_UNLIT_PGM        :: String'                             >> $@
 	@echo 'cGHC_UNLIT_PGM        = "$(GHC_UNLIT_PGM)"'                  >> $@
 	@echo 'cGHC_UNLIT_DIR        :: String'                             >> $@