X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=4e5fcbb002324a4042204fdd68b87263ec0f8a0d;hb=4fa44a3ae9c36222ccb460ba3ed24e46bf7c70ae;hp=15162b47f3b28b80635b782f4ef8fe862c8c2af5;hpb=011b3b8439402dd701093234fcca59bd38216206;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 15162b4..4e5fcbb 100644
--- a/Makefile
+++ b/Makefile
@@ -19,13 +19,9 @@ default:
 	@echo 'Run "make install" to install'
 	@false
 
-.PHONY: install
-install:
-	$(MAKE) -r --no-print-directory -f ghc.mk install BINDIST=YES NO_INCLUDE_DEPS=YES
-
-.PHONY: show
-show:
-	$(MAKE) -r --no-print-directory -f ghc.mk $@
+.PHONY: install show
+install show:
+	$(MAKE) -r --no-print-directory -f ghc.mk $@ BINDIST=YES NO_INCLUDE_DEPS=YES
 
 else
 
@@ -49,46 +45,21 @@ endif
 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)
+REALGOALS=$(filter-out binary-dist bootstrapping-files framework-pkg clean clean_% distclean maintainer-clean show help,$(MAKECMDGOALS))
 
 # 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 && test -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"