X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=a6e35876911338cb0cb5abf17ef349ec319e44a2;hb=aded94ea8b2cf40a3858011cd1454ff23c9246db;hp=0d563df8e1e7cf1dcc203346e2b15491f1980ac9;hpb=0bde11509ca13d4d0914496ee652d7c2b43a0420;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 0d563df..a6e3587 100644
--- a/Makefile
+++ b/Makefile
@@ -51,39 +51,24 @@ include mk/custom-settings.mk
 # No need to update makefiles for these targets:
 REALGOALS=$(filter-out bootstrapping-files framework-pkg clean clean_% distclean maintainer-clean show help,$(MAKECMDGOALS))
 
+# On Solaris, the builtin test doesn't support -nt, you have to use
+# /usr/bin/test.  On MSYS, however, /usr/bin/test does not exist.  How
+# nice.
+TEST=$(if $(wildcard /usr/bin/test),/usr/bin/test,test)
+
 # configure touches certain files even if they haven't changed.  This
 # can mean a lot of unnecessary recompilation after a re-configure, so
 # here we cache the old versions of these files so we can restore the
 # timestamps.
-#
-define check-configure-file
-# $1 = file
-if ! test -f $1.old; then \
-  echo "backing up $1"; \
-  cp $1 $1.old; \
-  touch -r $1 $1.old; \
-else \
-  if test $1 -nt $1.old; then \
-    if cmp $1 $1.old; then \
-       echo "$1 has been touched, but has not changed"; \
-       touch -r $1.old $1; \
-    else \
-       echo "$1 has changed"; \
-       cp $1 $1.old; \
-       touch -r $1 $1.old; \
-    fi \
-  fi \
-fi
-endef
+%.old:  %
+	@set -x && [ -f $@ ] && cmp -s $< $@ || cp -p $< $@
+	touch -r $@ $<
+
 
 # NB. not the same as saying '%: ...', which doesn't do the right thing:
 # it does nothing if we specify a target that already exists.
 .PHONY: $(REALGOALS)
-$(REALGOALS) all:
-	@$(call check-configure-file,mk/config.mk)
-	@$(call check-configure-file,mk/project.mk)
-	@$(call check-configure-file,compiler/ghc.cabal)
-
+$(REALGOALS) all: mk/config.mk.old mk/project.mk.old compiler/ghc.cabal.old
 	@echo "===--- updating makefiles phase 0"
 	$(MAKE) -r --no-print-directory -f ghc.mk phase=0 just-makefiles
 ifneq "$(OMIT_PHASE_1)" "YES"