From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Thu, 9 Jun 2016 03:43:40 +0000 (-0700)
Subject: Merge branch 'master' into Gtk.
X-Git-Tag: mit-scheme-pucked-9.2.12~312
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=3c374401bf6ffa2127b3d89edeb04913622b5fab;p=mit-scheme.git

Merge branch 'master' into Gtk.
---

3c374401bf6ffa2127b3d89edeb04913622b5fab
diff --cc src/blowfish/Makefile.am
index 82fcfad78,1a3d7e0e1..c6a6b7531
--- a/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 355301128,fd2c906ab..32dfe0d65
--- a/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 d3dce9b8b,61c4b8439..e1e07255b
--- a/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 acf944da1,fc43c2201..8c7c75e43
--- a/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 a106da4f9,eede07c9a..cd5bee268
--- a/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/Makefile.am
index 80c061853,007a0d1d3..983870743
--- a/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`