From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Fri, 23 Mar 2012 14:31:33 +0000 (-0700)
Subject: Merge branch 'master' into Gtk
X-Git-Tag: mit-scheme-pucked-9.2.12~593
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=48993e7b2fcc1bb910290a48938dbbb6f4ac635e;p=mit-scheme.git

Merge branch 'master' into Gtk
---

48993e7b2fcc1bb910290a48938dbbb6f4ac635e
diff --cc src/Makefile.in
index 68b9a5e7d,9fc533de1..976ab85e7
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@@ -87,11 -87,12 +87,12 @@@ all-native: compile-microcod
  all-svm: microcode/svm1-defns.h
  	$(MAKE) compile-microcode
  	@$(top_srcdir)/etc/compile-svm.sh "$(MIT_SCHEME_EXE)"
 -	$(MAKE) build-bands #build-ffis
 +	$(MAKE) build-bands build-ffis
  
  microcode/svm1-defns.h: compiler/machines/svm/svm1-defns.h
- 	if ! cmp compiler/machines/svm/svm1-defns.h microcode/svm1-defns.h; \
- 	then cp compiler/machines/svm/svm1-defns.h microcode/svm1-defns.h; fi
+ 	@$(top_srcdir)/etc/maybe-update-file.sh \
+ 	  compiler/machines/svm/svm1-defns.h \
+ 	  microcode/svm1-defns.h
  
  compiler/machines/svm/svm1-defns.h: \
  	  compiler/machines/svm/assembler-rules.scm \