Merge branch 'master' into Gtk.

diff --cc src/blowfish/Makefile.am
index 82fcfad782322b202cce5ba79d058594addb2eee,1a3d7e0e1b5baefc309a8fe584f2481e363be513..c6a6b75313651c90535bf677a66daf0d203527fd
--- 1/src/blowfish/Makefile.am
--- 2/src/blowfish/Makefile.am
+++ b/src/blowfish/Makefile.am
@@@ -44,9 -44,9 +44,9 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
  
- AM_CPPFLAGS = -I$(scmlibdir)
+ AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
  
  blowfish_shim_la_LIBADD = blowfish-adapter.lo
  blowfish_shim_la_LDFLAGS = -module -avoid-version -shared

diff --cc src/gdbm/Makefile.am
index 3553011283733fed5cb36d49140c9ad5b0c1af1b,fd2c906ab6d64f5c5527f387613bbeece779c951..32dfe0d6558451cfc54c1af3045b04f52643b052
--- 1/src/gdbm/Makefile.am
--- 2/src/gdbm/Makefile.am
+++ b/src/gdbm/Makefile.am
@@@ -44,9 -44,9 +44,9 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
  
- AM_CPPFLAGS = -I$(scmlibdir)
+ AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
  
  gdbm_shim_la_LIBADD = gdbm-adapter.lo
  gdbm_shim_la_LDFLAGS = -module -avoid-version -shared

diff --cc src/mcrypt/Makefile.am
index d3dce9b8b3500044f805de7eabb8f193384304d3,61c4b84394533166ffef313aa0a29ccee856e3d9..e1e07255ba8f0d99480e916783dc41ce06a6c8f9
--- 1/src/mcrypt/Makefile.am
--- 2/src/mcrypt/Makefile.am
+++ b/src/mcrypt/Makefile.am
@@@ -44,9 -44,9 +44,9 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
  
- AM_CPPFLAGS = -I$(scmlibdir)
+ AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
  
  mcrypt_shim_la_LIBADD = mcrypt-adapter.lo
  mcrypt_shim_la_LDFLAGS = -module -avoid-version -shared

diff --cc src/md5/Makefile.am
index acf944da1de522cf7c89386600c1419efac3fee1,fc43c22013d212e04c76f82e5695ec54855cf0aa..8c7c75e433bd4524eadaf67107d8ba26c2e2540d
--- 1/src/md5/Makefile.am
--- 2/src/md5/Makefile.am
+++ b/src/md5/Makefile.am
@@@ -44,9 -44,9 +44,9 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
  
- AM_CPPFLAGS = -I$(scmlibdir)
+ AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
  
  md5_shim_la_LIBADD = md5-adapter.lo
  md5_shim_la_LDFLAGS = -module -avoid-version -shared

diff --cc src/mhash/Makefile.am
index a106da4f9a5b81ceb08d655cd0d1ad7b30f07312,eede07c9a6e0c3ddbe14784b6b13e51985a117ac..cd5bee268bfeb401ad55ef0b8efa069ff22fe3f0
--- 1/src/mhash/Makefile.am
--- 2/src/mhash/Makefile.am
+++ b/src/mhash/Makefile.am
@@@ -44,9 -44,9 +44,9 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
  
- AM_CPPFLAGS = -I$(scmlibdir)
+ AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
  
  mhash_shim_la_LIBADD = mhash-adapter.lo
  mhash_shim_la_LDFLAGS = -module -avoid-version -shared

diff --cc src/x11-screen/Makefile.am
Simple merge

diff --cc src/x11/Makefile.am
index 80c061853860b4f64334260084120f637ffa4621,007a0d1d3509db3a50f089a04b27b4333b32ef5e..983870743cc86cdf2751e0d113c38d380b0ebeb2
--- 1/src/x11/Makefile.am
--- 2/src/x11/Makefile.am
+++ b/src/x11/Makefile.am
@@@ -46,11 -46,11 +46,11 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 -dvidir = $(libdir)/mit-scheme/doc
 -pdfdir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
 +dvidir = $(libdir)/mit-scheme-pucked/doc
 +pdfdir = $(libdir)/mit-scheme-pucked/doc
  
- AM_CPPFLAGS = -I$(scmlibdir)
+ AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
  AM_CFLAGS = `pkg-config --cflags x11`
  LIBS = `pkg-config --libs x11`