From 14bb0e9e8caae59eabf44defd6434e3c7aff6810 Mon Sep 17 00:00:00 2001
From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Sat, 28 May 2016 19:44:40 -0700
Subject: [PATCH] plugin builds: Punt AC_PROG_LIBTOOL. Use MIT_SCHEME_LIBDIR.

AC_PROG_LIBTOOL is deprecated.  MIT_SCHEME_LIBDIR replaces both
MIT_SCHEME_ARCH and the project name, allowing the latter to be more
easily changed.
---
 src/cairo/Makefile.am        | 12 ++++++------
 src/cairo/configure.ac       | 17 ++++++++--------
 src/gl/Makefile.am           | 12 ++++++------
 src/gl/configure.ac          | 38 +++++++++++++++++-------------------
 src/glib/Makefile.am         | 12 ++++++------
 src/glib/configure.ac        | 17 ++++++++--------
 src/gtk-screen/Makefile.am   | 12 ++++++------
 src/gtk-screen/configure.ac  |  9 +++++----
 src/gtk/Makefile.am          | 12 ++++++------
 src/gtk/configure.ac         | 17 ++++++++--------
 src/pango/Makefile.am        | 12 ++++++------
 src/pango/configure.ac       | 17 ++++++++--------
 src/planetarium/Makefile.am  | 12 ++++++------
 src/planetarium/configure.ac |  9 +++++----
 14 files changed, 102 insertions(+), 106 deletions(-)

diff --git a/src/cairo/Makefile.am b/src/cairo/Makefile.am
index 8ffd47821..d5286a8e8 100644
--- a/src/cairo/Makefile.am
+++ b/src/cairo/Makefile.am
@@ -24,8 +24,8 @@ ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = autogen.sh
 
 MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
-scmlibdir = $(libdir)/mit-scheme-@MIT_SCHEME_ARCH@
-scmlib_cairodir = $(scmlibdir)/cairo
+scmlibdir = @MIT_SCHEME_LIBDIR@
+scmlib_cairodir = $(scmlibdir)cairo
 
 scmlib_LTLIBRARIES = cairo-shim.la
 scmlib_DATA = cairo-types.bin cairo-const.bin
@@ -96,12 +96,12 @@ tags: tags-am
 ETAGS_ARGS = $(sources) -r '/^([^iI].*/' $(cdecls)
 TAGS_DEPENDENCIES = $(sources) $(cdecls)
 
-EXTRA_DIST += $(sources) $(cdecls) cairo.pkg
-EXTRA_DIST += compile.sh cairo-check.sh
+EXTRA_DIST += $(sources) $(cdecls) compile.sh cairo.pkg
+EXTRA_DIST += cairo-check.sh
 EXTRA_DIST += make.scm optiondb.scm check-doc.sh tags-fix.sh
 
 install-data-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 
 install-html: install-html-am
@@ -109,7 +109,7 @@ install-html: install-html-am
 	| $(MIT_SCHEME_EXE) --batch-mode
 
 uninstall-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 	[ -d "$(DESTDIR)$(scmlib_cairodir)" ] \
 	&& rmdir "$(DESTDIR)$(scmlib_cairodir)"
diff --git a/src/cairo/configure.ac b/src/cairo/configure.ac
index a2412475f..48e4bc446 100644
--- a/src/cairo/configure.ac
+++ b/src/cairo/configure.ac
@@ -54,15 +54,13 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 AM_INIT_AUTOMAKE
 
-AC_PROG_LIBTOOL
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen])
+
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 
-dnl Initialize libtool
-LT_PREREQ([2.2.6])
-LT_INIT([dlopen win32-dll])
-
 AC_CHECK_PROG([PKG_CONFIG], [pkg-config], [yes])
 
 if ! pkg-config --exists cairo 2>/dev/null; then
@@ -70,13 +68,14 @@ if ! pkg-config --exists cairo 2>/dev/null; then
 fi
 
 : ${MIT_SCHEME_EXE=mit-scheme}
-MIT_SCHEME_ARCH=`echo "(display microcode-id/compiled-code-type)" \
-		 | ${MIT_SCHEME_EXE} --batch-mode`
+MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+		     echo "          (system-library-directory-pathname)))" ) \
+		   | ${MIT_SCHEME_EXE} --batch-mode`
 MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-		 | ${MIT_SCHEME_EXE} --batch-mode`
+		      | ${MIT_SCHEME_EXE} --batch-mode`
 
 AC_SUBST([MIT_SCHEME_EXE])
-AC_SUBST([MIT_SCHEME_ARCH])
+AC_SUBST([MIT_SCHEME_LIBDIR])
 AC_SUBST([MIT_SCHEME_OS_SUFFIX])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/src/gl/Makefile.am b/src/gl/Makefile.am
index f7be7c146..20e9414b0 100644
--- a/src/gl/Makefile.am
+++ b/src/gl/Makefile.am
@@ -24,8 +24,8 @@ ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = autogen.sh
 
 MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
-scmlibdir = $(libdir)/mit-scheme-@MIT_SCHEME_ARCH@
-scmlib_gldir = $(scmlibdir)/gl
+scmlibdir = @MIT_SCHEME_LIBDIR@
+scmlib_gldir = $(scmlibdir)gl
 
 scmlib_LTLIBRARIES = gl-shim.la
 scmlib_DATA = gl-types.bin gl-const.bin
@@ -93,12 +93,12 @@ all_sources = $(sources) gl-adapter.c
 ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls)
 TAGS_DEPENDENCIES = $(all_sources) $(cdecls)
 
-EXTRA_DIST += $(all_sources) $(cdecls) gl.pkg
-EXTRA_DIST += compile.sh gl-check.sh gl-tests.scm
+EXTRA_DIST += $(all_sources) $(cdecls) compile.sh gl.pkg
+EXTRA_DIST += gl-check.sh gl-tests.scm
 EXTRA_DIST += make.scm optiondb.scm tags-fix.sh
 
 install-data-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 
 #install-html: install-html-am
@@ -106,7 +106,7 @@ install-data-hook:
 #	| $(MIT_SCHEME_EXE) --batch-mode
 
 uninstall-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 	[ -d "$(DESTDIR)$(scmlib_gldir)" ] \
 	&& rmdir "$(DESTDIR)$(scmlib_gldir)"
diff --git a/src/gl/configure.ac b/src/gl/configure.ac
index ed1761141..041dfbf0c 100644
--- a/src/gl/configure.ac
+++ b/src/gl/configure.ac
@@ -27,43 +27,40 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this plugin; if not, write to the Free Software Foundation,
 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
 ])
 
 AH_TOP([/*
 
-Copyright (C) 2013, 2014, 2015, 2016 Matthew Birkholz
+Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
+    2016 Matthew Birkholz
 
-This file is part of a plugin for MIT/GNU Scheme.
+This file is part of an OpenGL plugin for MIT/GNU Scheme.
 
-MIT/GNU Scheme is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at
-your option) any later version.
+This plugin is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.
 
-MIT/GNU Scheme is distributed in the hope that it will be useful, but
+This plugin is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with MIT/GNU Scheme; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
-USA.
+along with this plugin; if not, write to the Free Software Foundation,
+Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 */])
 
 AM_INIT_AUTOMAKE
 
-AC_PROG_LIBTOOL
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen])
+
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 
-dnl Initialize libtool
-LT_PREREQ([2.2.6])
-LT_INIT([dlopen win32-dll])
-
 AC_CHECK_PROG([PKG_CONFIG], [pkg-config], [yes])
 
 if ! pkg-config --exists gl glu gtk+-3.0 2>/dev/null; then
@@ -71,13 +68,14 @@ if ! pkg-config --exists gl glu gtk+-3.0 2>/dev/null; then
 fi
 
 : ${MIT_SCHEME_EXE=mit-scheme}
-MIT_SCHEME_ARCH=`echo "(display microcode-id/compiled-code-type)" \
-		 | ${MIT_SCHEME_EXE} --batch-mode`
+MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+		     echo "          (system-library-directory-pathname)))" ) \
+		   | ${MIT_SCHEME_EXE} --batch-mode`
 MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-		 | ${MIT_SCHEME_EXE} --batch-mode`
+		      | ${MIT_SCHEME_EXE} --batch-mode`
 
 AC_SUBST([MIT_SCHEME_EXE])
-AC_SUBST([MIT_SCHEME_ARCH])
+AC_SUBST([MIT_SCHEME_LIBDIR])
 AC_SUBST([MIT_SCHEME_OS_SUFFIX])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/src/glib/Makefile.am b/src/glib/Makefile.am
index 034f2c8f5..131242373 100644
--- a/src/glib/Makefile.am
+++ b/src/glib/Makefile.am
@@ -24,8 +24,8 @@ ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = autogen.sh
 
 MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
-scmlibdir = $(libdir)/mit-scheme-@MIT_SCHEME_ARCH@
-scmlib_glibdir = $(scmlibdir)/glib
+scmlibdir = @MIT_SCHEME_LIBDIR@
+scmlib_glibdir = $(scmlibdir)glib
 
 scmlib_LTLIBRARIES = glib-shim.la
 scmlib_DATA = glib-types.bin glib-const.bin
@@ -111,12 +111,12 @@ all_sources = $(sources) glibio.c
 ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls)
 TAGS_DEPENDENCIES = $(all_sources) $(cdecls)
 
-EXTRA_DIST += $(all_sources) $(cdecls) glib.pkg
-EXTRA_DIST += compile.sh glib-tests.scm glib-check-copy.sh glib-check-list.sh
+EXTRA_DIST += $(all_sources) $(cdecls) compile.sh glib.pkg
+EXTRA_DIST += glib-tests.scm glib-check-copy.sh glib-check-list.sh
 EXTRA_DIST += make.scm optiondb.scm check-doc.sh tags-fix.sh
 
 install-data-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 
 install-html: install-html-am
@@ -124,7 +124,7 @@ install-html: install-html-am
 	| $(MIT_SCHEME_EXE) --batch-mode
 
 uninstall-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 	[ -d "$(DESTDIR)$(scmlib_glibdir)" ] \
 	&& rmdir "$(DESTDIR)$(scmlib_glibdir)"
diff --git a/src/glib/configure.ac b/src/glib/configure.ac
index 8671e2895..842bc0f38 100644
--- a/src/glib/configure.ac
+++ b/src/glib/configure.ac
@@ -54,15 +54,13 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 AM_INIT_AUTOMAKE
 
-AC_PROG_LIBTOOL
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen])
+
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 
-dnl Initialize libtool
-LT_PREREQ([2.2.6])
-LT_INIT([dlopen win32-dll])
-
 AC_CHECK_PROG([PKG_CONFIG], [pkg-config], [yes])
 
 if ! pkg-config --exists glib-2.0 2>/dev/null; then
@@ -70,13 +68,14 @@ if ! pkg-config --exists glib-2.0 2>/dev/null; then
 fi
 
 : ${MIT_SCHEME_EXE=mit-scheme}
-MIT_SCHEME_ARCH=`echo "(display microcode-id/compiled-code-type)" \
-		 | ${MIT_SCHEME_EXE} --batch-mode`
+MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+		     echo "          (system-library-directory-pathname)))" ) \
+		   | ${MIT_SCHEME_EXE} --batch-mode`
 MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-		 | ${MIT_SCHEME_EXE} --batch-mode`
+		      | ${MIT_SCHEME_EXE} --batch-mode`
 
 AC_SUBST([MIT_SCHEME_EXE])
-AC_SUBST([MIT_SCHEME_ARCH])
+AC_SUBST([MIT_SCHEME_LIBDIR])
 AC_SUBST([MIT_SCHEME_OS_SUFFIX])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/src/gtk-screen/Makefile.am b/src/gtk-screen/Makefile.am
index 65d0d2288..8fdac1136 100644
--- a/src/gtk-screen/Makefile.am
+++ b/src/gtk-screen/Makefile.am
@@ -24,8 +24,8 @@
 EXTRA_DIST = autogen.sh
 
 MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
-scmlibdir = $(libdir)/mit-scheme-@MIT_SCHEME_ARCH@
-scmlib_subdir = $(scmlibdir)/gtk-screen
+scmlibdir = @MIT_SCHEME_LIBDIR@
+scmlib_subdir = $(scmlibdir)gtk-screen
 
 sources = gtk-screen.scm gtk-faces.scm
 
@@ -58,12 +58,12 @@ TESTS = check.sh
 ETAGS_ARGS = $(sources)
 TAGS_DEPENDENCIES = $(sources)
 
-EXTRA_DIST += $(sources) gtk-screen.pkg
-EXTRA_DIST += compile.sh check.sh
+EXTRA_DIST += $(sources) compile.sh gtk-screen.pkg
+EXTRA_DIST += check.sh
 EXTRA_DIST += make.scm optiondb.scm
 
 install-data-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 
 #install-html: install-html-am
@@ -71,7 +71,7 @@ install-data-hook:
 #	| $(MIT_SCHEME_EXE) --batch-mode
 
 uninstall-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 	[ -d "$(DESTDIR)$(scmlib_subdir)" ] \
 	&& rmdir "$(DESTDIR)$(scmlib_subdir)"
diff --git a/src/gtk-screen/configure.ac b/src/gtk-screen/configure.ac
index 56db0a0ba..932932c8f 100644
--- a/src/gtk-screen/configure.ac
+++ b/src/gtk-screen/configure.ac
@@ -32,13 +32,14 @@ AM_INIT_AUTOMAKE
 AC_PROG_INSTALL
 
 : ${MIT_SCHEME_EXE=mit-scheme}
-MIT_SCHEME_ARCH=`echo "(display microcode-id/compiled-code-type)" \
-		 | ${MIT_SCHEME_EXE} --batch-mode`
+MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+		     echo "          (system-library-directory-pathname)))" ) \
+		   | ${MIT_SCHEME_EXE} --batch-mode`
 MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-		 | ${MIT_SCHEME_EXE} --batch-mode`
+		      | ${MIT_SCHEME_EXE} --batch-mode`
 
 AC_SUBST([MIT_SCHEME_EXE])
-AC_SUBST([MIT_SCHEME_ARCH])
+AC_SUBST([MIT_SCHEME_LIBDIR])
 AC_SUBST([MIT_SCHEME_OS_SUFFIX])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
index d08be760f..7301c8af3 100644
--- a/src/gtk/Makefile.am
+++ b/src/gtk/Makefile.am
@@ -24,8 +24,8 @@ ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = autogen.sh
 
 MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
-scmlibdir = $(libdir)/mit-scheme-@MIT_SCHEME_ARCH@
-scmlib_gtkdir = $(scmlibdir)/gtk
+scmlibdir = @MIT_SCHEME_LIBDIR@
+scmlib_gtkdir = $(scmlibdir)gtk
 
 scmlib_LTLIBRARIES = gtk-shim.la
 scmlib_DATA = gtk-types.bin gtk-const.bin conses.png
@@ -145,8 +145,8 @@ all_sources = $(sources) $(c_sources)
 ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls)
 TAGS_DEPENDENCIES = $(all_sources) $(cdecls)
 
-EXTRA_DIST += $(all_sources) $(cdecls) gtk.pkg
-EXTRA_DIST += compile.sh gtk-check.sh gtk-tests.scm
+EXTRA_DIST += $(all_sources) $(cdecls) compile.sh gtk.pkg
+EXTRA_DIST += gtk-check.sh gtk-tests.scm
 EXTRA_DIST += make.scm optiondb.scm check-doc.sh tags-fix.sh
 EXTRA_DIST += gtkpanedview-3.10.8.c gtkscrolledview-3.10.8.c
 EXTRA_DIST += gtkpanedview-3.14.13.c gtkscrolledview-3.14.13.c
@@ -155,7 +155,7 @@ EXTRA_DIST += gtkpanedview-3.6.0.c gtkscrolledview-3.6.0.c
 EXTRA_DIST += conses.png hello.scm test-gport-performance.scm
 
 install-data-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 
 install-html: install-html-am
@@ -163,7 +163,7 @@ install-html: install-html-am
 	| $(MIT_SCHEME_EXE) --batch-mode
 
 uninstall-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 	[ -d "$(DESTDIR)$(scmlib_gtkdir)" ] \
 	&& rmdir "$(DESTDIR)$(scmlib_gtkdir)"
diff --git a/src/gtk/configure.ac b/src/gtk/configure.ac
index 79aa8a1ac..ec1623df4 100644
--- a/src/gtk/configure.ac
+++ b/src/gtk/configure.ac
@@ -54,15 +54,13 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 AM_INIT_AUTOMAKE
 
-AC_PROG_LIBTOOL
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen])
+
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 
-dnl Initialize libtool
-LT_PREREQ([2.2.6])
-LT_INIT([dlopen win32-dll])
-
 AC_CHECK_PROG([PKG_CONFIG], [pkg-config], [yes])
 
 if ! pkg-config --exists gtk+-3.0 2>/dev/null; then
@@ -92,13 +90,14 @@ ln -sf gtkscrolledview-$GTK_VERSION.c gtkscrolledview.c
 ln -sf gtkpanedview-$GTK_VERSION.c gtkpanedview.c
 
 : ${MIT_SCHEME_EXE=mit-scheme}
-MIT_SCHEME_ARCH=`echo "(display microcode-id/compiled-code-type)" \
-		 | ${MIT_SCHEME_EXE} --batch-mode`
+MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+		     echo "          (system-library-directory-pathname)))" ) \
+		   | ${MIT_SCHEME_EXE} --batch-mode`
 MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-		 | ${MIT_SCHEME_EXE} --batch-mode`
+		      | ${MIT_SCHEME_EXE} --batch-mode`
 
 AC_SUBST([MIT_SCHEME_EXE])
-AC_SUBST([MIT_SCHEME_ARCH])
+AC_SUBST([MIT_SCHEME_LIBDIR])
 AC_SUBST([MIT_SCHEME_OS_SUFFIX])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/src/pango/Makefile.am b/src/pango/Makefile.am
index ccaf69780..8d9348354 100644
--- a/src/pango/Makefile.am
+++ b/src/pango/Makefile.am
@@ -24,8 +24,8 @@ ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = autogen.sh
 
 MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
-scmlibdir = $(libdir)/mit-scheme-@MIT_SCHEME_ARCH@
-scmlib_pangodir = $(scmlibdir)/pango
+scmlibdir = @MIT_SCHEME_LIBDIR@
+scmlib_pangodir = $(scmlibdir)pango
 
 scmlib_LTLIBRARIES = pango-shim.la
 scmlib_DATA = pango-types.bin pango-const.bin
@@ -92,12 +92,12 @@ tags: tags-am
 ETAGS_ARGS = $(sources) -r '/^([^iI].*/' $(cdecls)
 TAGS_DEPENDENCIES = $(sources) $(cdecls)
 
-EXTRA_DIST += $(sources) $(cdecls) pango.pkg
-EXTRA_DIST += compile.sh pango-check.sh
+EXTRA_DIST += $(sources) $(cdecls) compile.sh pango.pkg
+EXTRA_DIST += pango-check.sh
 EXTRA_DIST += make.scm optiondb.scm check-doc.sh tags-fix.sh
 
 install-data-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 
 install-html: install-html-am
@@ -105,7 +105,7 @@ install-html: install-html-am
 	| $(MIT_SCHEME_EXE) --batch-mode
 
 uninstall-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 	[ -d "$(DESTDIR)$(scmlib_pangodir)" ] \
 	&& rmdir "$(DESTDIR)$(scmlib_pangodir)"
diff --git a/src/pango/configure.ac b/src/pango/configure.ac
index 55fe89198..d264fc628 100644
--- a/src/pango/configure.ac
+++ b/src/pango/configure.ac
@@ -54,15 +54,13 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 AM_INIT_AUTOMAKE
 
-AC_PROG_LIBTOOL
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen])
+
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 
-dnl Initialize libtool
-LT_PREREQ([2.2.6])
-LT_INIT([dlopen win32-dll])
-
 AC_CHECK_PROG([PKG_CONFIG], [pkg-config], [yes])
 
 if ! pkg-config --exists pango 2>/dev/null; then
@@ -70,13 +68,14 @@ if ! pkg-config --exists pango 2>/dev/null; then
 fi
 
 : ${MIT_SCHEME_EXE=mit-scheme}
-MIT_SCHEME_ARCH=`echo "(display microcode-id/compiled-code-type)" \
-		 | ${MIT_SCHEME_EXE} --batch-mode`
+MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+		     echo "          (system-library-directory-pathname)))" ) \
+		   | ${MIT_SCHEME_EXE} --batch-mode`
 MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-		 | ${MIT_SCHEME_EXE} --batch-mode`
+		      | ${MIT_SCHEME_EXE} --batch-mode`
 
 AC_SUBST([MIT_SCHEME_EXE])
-AC_SUBST([MIT_SCHEME_ARCH])
+AC_SUBST([MIT_SCHEME_LIBDIR])
 AC_SUBST([MIT_SCHEME_OS_SUFFIX])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/src/planetarium/Makefile.am b/src/planetarium/Makefile.am
index e99e742f4..b48d4bea2 100644
--- a/src/planetarium/Makefile.am
+++ b/src/planetarium/Makefile.am
@@ -23,8 +23,8 @@
 EXTRA_DIST = autogen.sh
 
 MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
-scmlibdir = $(libdir)/mit-scheme-@MIT_SCHEME_ARCH@
-scmlib_planetariumdir = $(scmlibdir)/planetarium
+scmlibdir = @MIT_SCHEME_LIBDIR@
+scmlib_planetariumdir = $(scmlibdir)planetarium
 
 sources = earth.scm geometry.scm google-earth.scm graphics.scm
 sources += matrices.scm mit-cairo.scm mit-cil.scm mit-graphics.scm mit-gtk.scm
@@ -126,13 +126,13 @@ CLEANFILES += sample-terrain.txt
 ETAGS_ARGS = $(sources)
 TAGS_DEPENDENCIES = $(sources)
 
-EXTRA_DIST += $(sources) mit.pkg mit-3d.pkg
-EXTRA_DIST += mit-compile.sh mit-link.scm mit-check.sh
+EXTRA_DIST += $(sources) mit-compile.sh mit-link.scmf mit.pkg mit-3d.pkg
+EXTRA_DIST += mit-check.sh
 EXTRA_DIST += mit-make.scm mit-optiondb.scm cil-*.txt
 EXTRA_DIST += mit-snapshot.scm
 
 install-data-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 
 install-html: install-html-am
@@ -140,7 +140,7 @@ install-html: install-html-am
 	| $(MIT_SCHEME_EXE) --batch-mode
 
 uninstall-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 	[ -d "$(DESTDIR)$(scmlib_planetariumdir)" ] \
 	&& rmdir "$(DESTDIR)$(scmlib_planetariumdir)"
diff --git a/src/planetarium/configure.ac b/src/planetarium/configure.ac
index a7695b07d..6a2122102 100644
--- a/src/planetarium/configure.ac
+++ b/src/planetarium/configure.ac
@@ -33,13 +33,14 @@ AM_INIT_AUTOMAKE
 AC_PROG_INSTALL
 
 : ${MIT_SCHEME_EXE=mit-scheme}
-MIT_SCHEME_ARCH=`echo "(display microcode-id/compiled-code-type)" \
-		 | ${MIT_SCHEME_EXE} --batch-mode`
+MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+		     echo "          (system-library-directory-pathname)))" ) \
+		   | ${MIT_SCHEME_EXE} --batch-mode`
 MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-		 | ${MIT_SCHEME_EXE} --batch-mode`
+		      | ${MIT_SCHEME_EXE} --batch-mode`
 
 AC_SUBST([MIT_SCHEME_EXE])
-AC_SUBST([MIT_SCHEME_ARCH])
+AC_SUBST([MIT_SCHEME_LIBDIR])
 AC_SUBST([MIT_SCHEME_OS_SUFFIX])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
-- 
2.25.1