Merge branch 'master' into Gtk.

diff --cc src/Makefile.in
index 98ff0bb5822b5609819774ee96748d7320c0242e,0ae21ef9cb2e60fb5d4d37705b0fcf3ea352c4ed..18460c3df0f9d7bb8c82bfc7a7c6606abf8952c3
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -680,10 -750,89 +682,15 @@@ cross-target: cross-hos
  cross-end: cross-host
        (echo '(let ((env (->environment (quote (RUNTIME)))))' && \
         echo '  (load "../compiler/base/crsend" env)' && \
-        echo '  ((access FINISH-CROSS-COMPILATION:DIRECTORY env) ".."))') \
+        echo '  ((access FINISH-CROSS-COMPILATION:FILES env) ".."))') \
        | (cd runtime && ../microcode/scheme --batch-mode --library ../lib \
-           --fasl make.bin)
+                                            --fasl make.bin)
+       (echo '(let ((env (->environment (quote (RUNTIME)))))' && \
+        echo '  (load "../compiler/base/crsend" env)' && \
+        echo '  ((access FINISH-CROSS-COMPILATION:INFO-FILES env) ".."))') \
+        | (cd runtime && ../microcode/scheme --batch-mode --library ../lib \
+                                             --fasl make.com)
  
 -### Stuff that depends on running the code we just compiled, because it
 -### uses Edwin macros.  This is a kludge until we can fix macro phasing
 -### and persuade the cross-compiler to load and run macros for the
 -### target.
 -
 -# IMAIL
 -
 -.PHONY: all-imail
 -all-imail: compile-imail
 -@IF_LIARC@all-imail: bundle-imail
 -
 -.PHONY: bundle-imail
 -bundle-imail: liarc-bundle-tools
 -bundle-imail: compile-imail
 -bundle-imail: imail/imail-unx.c
 -bundle-imail: imail/imail-w32.c
 -      (cd imail && $(MAKE) compile-liarc-bundle)
 -
 -# Must write these rules explicitly because we use TARGET_COMPILER, not
 -# TOOL_COMPILER.
 -#
 -# XXX These depend on imail/imail-unx.pkd intentionally because make
 -# has no good way to express a rule that generates multiple files at
 -# once.
 -imail/imail-unx.c: imail/imail-unx.pkd
 -      echo '(cbf "imail/imail-unx.pkd")' | $(TARGET_COMPILER)
 -imail/imail-w32.c: imail/imail-unx.pkd
 -      echo '(cbf "imail/imail-w32.pkd")' | $(TARGET_COMPILER)
 -
 -# XXX We enter lib/imail/ rather than imail/ so that liarc library
 -# directory pathnames get resolved to builtin objects.  This is a
 -# kludge.
 -
 -.PHONY: compile-imail
 -compile-imail: target-toolchain
 -compile-imail: compile-edwin
 -compile-imail: compile-runtime
 -compile-imail: compile-sos
 -compile-imail: compile-star-parser
 -compile-imail: cref-imail
 -      (echo '(begin' && \
 -       echo '  (load-option (quote *PARSER))' && \
 -       echo '  (load-option (quote EDWIN))' && \
 -       echo '  (load-option (quote SOS))' && \
 -       echo '  (with-working-directory-pathname "lib/imail"' && \
 -       echo '    (lambda ()' && \
 -       echo '      (load "compile"))))') \
 -      | $(TARGET_TOOLCHAIN)
 -
 -.PHONY: cref-imail
 -cref-imail: imail/imail-unx.pkd
 -
 -@IF_LIARC@IMAIL_CREF_PRELOAD = \
 -@IF_LIARC@    echo '(load-option (quote SOS))' && \
 -@IF_LIARC@    echo '(load-option (quote EDWIN))' && \
 -@IF_LIARC@    echo '(load-option (quote *PARSER))' &&
 -
 -imail/imail-unx.pkd: target-toolchain
 -imail/imail-unx.pkd: cref-edwin
 -imail/imail-unx.pkd: cref-runtime
 -imail/imail-unx.pkd: cref-sos
 -imail/imail-unx.pkd: cref-star-parser
 -@IF_LIARC@imail/imail-unx.pkd: all-edwin
 -@IF_LIARC@imail/imail-unx.pkd: all-runtime
 -@IF_LIARC@imail/imail-unx.pkd: all-sos
 -@IF_LIARC@imail/imail-unx.pkd: all-star-parser
 -imail/imail-unx.pkd: imail/imail.pkg
 -      (echo '(begin' && \
 -       $(IMAIL_CREF_PRELOAD) \
 -       echo '  (with-working-directory-pathname "lib/imail"' && \
 -       echo '    (lambda ()' && \
 -       echo '      (cref/generate-trivial-constructor "imail"))))') \
 -      | $(TARGET_SYNTAXER)
 -
  # **** Legacy serialized targets ****
  
  all-liarc:

diff --cc src/runtime/make.scm
Simple merge

diff --cc src/runtime/runtime.pkg
Simple merge