Pucked plugin builds: Use MIT_SCHEME_PKD, not MIT_SCHEME_OS_SUFFIX.

diff --git a/src/devops/Makefile.am b/src/devops/Makefile.am
index fd80d46166689f5314d213dfb83db7cbd51b0447..b8a23eedd6b1d587cc9d7bc3605bb803244e255c 100644 (file)
--- a/src/devops/Makefile.am
+++ b/src/devops/Makefile.am
@@ -35,7 +35,7 @@ binaries += build.bin build.bci build.com
 binaries += lint.bin lint.bci lint.com
 
 scmlib_sub_DATA = $(sources) $(binaries)
-scmlib_sub_DATA += make.scm devops.pkg devops-@MIT_SCHEME_OS_SUFFIX@.pkd
+scmlib_sub_DATA += make.scm devops.pkg @MIT_SCHEME_PKD@
 
 scminfo_DATA = devops.info
 info_TEXINFOS = devops.texi
@@ -52,7 +52,7 @@ build.com: stamp-scheme
 lint.bin: stamp-scheme
 lint.bci: stamp-scheme
 lint.com: stamp-scheme
-devops-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+@MIT_SCHEME_PKD@: stamp-scheme
 stamp-scheme: $(sources) devops.pkg
        touch stamp-scheme
        if ! ./compile.sh; then rm stamp-scheme; exit 1; fi

diff --git a/src/devops/configure.ac b/src/devops/configure.ac
index ae5d3031f68b7b0796945d360d1b4873cd5ebdde..b38d687414acd96785db0edd0f6a03b05edbfa1b 100644 (file)
--- a/src/devops/configure.ac
+++ b/src/devops/configure.ac
@@ -42,16 +42,20 @@ AC_PROG_INSTALL
 
 MIT_SCHEME_PROJECT=mit-scheme-pucked
 : ${MIT_SCHEME_EXE=mit-scheme}
-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`
+if test x"${MIT_SCHEME_LIBDIR}" = x; then
+    MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+                        echo "          (system-library-directory-pathname)))" ) \
+                        | ${MIT_SCHEME_EXE} --batch-mode`
+fi
+if test x"${MIT_SCHEME_PKD}" = x; then
+    os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
+              | ${MIT_SCHEME_EXE} --batch-mode`
+    MIT_SCHEME_PKD="devops-${os_suffix}.pkd"
+fi
 
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])
-AC_SUBST([MIT_SCHEME_OS_SUFFIX])
+AC_SUBST([MIT_SCHEME_PKD])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/src/gl/Makefile.am b/src/gl/Makefile.am
index 4593f431dea4410a749c25d7dc30ed7b979e09b3..ba7f91b2b6c0f42f39a033a2d3717cd75fc3fd9a 100644 (file)
--- a/src/gl/Makefile.am
+++ b/src/gl/Makefile.am
@@ -41,7 +41,7 @@ binaries += gl-glxgears.bci gl-glxgears.com
 
 scmlib_sub_DATA = $(sources)
 scmlib_sub_DATA += $(binaries)
-scmlib_sub_DATA += make.scm gl.pkg gl-@MIT_SCHEME_OS_SUFFIX@.pkd
+scmlib_sub_DATA += make.scm gl.pkg @MIT_SCHEME_PKD@
 
 #scminfo_DATA = gl.info
 #info_TEXINFOS = gl.texi
@@ -82,7 +82,7 @@ gl-glx.bci: stamp-scheme
 gl-glx.com: stamp-scheme
 gl-glxgears.bci: stamp-scheme
 gl-glxgears.com: stamp-scheme
-gl-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+@MIT_SCHEME_PKD@: stamp-scheme
 stamp-scheme: stamp-shim $(sources) gl-const.bin gl.pkg
        touch stamp-scheme
        if ! ./compile.sh; then rm stamp-scheme; exit 1; fi

diff --git a/src/gl/configure.ac b/src/gl/configure.ac
index 9080de1360ca5c67534200f074d367a392892fb0..f7f9949c6c732ee08a5136f8eb81761ebbf925e4 100644 (file)
--- a/src/gl/configure.ac
+++ b/src/gl/configure.ac
@@ -108,22 +108,29 @@ fi
 
 MIT_SCHEME_PROJECT=mit-scheme-pucked
 : ${MIT_SCHEME_EXE=mit-scheme}
-MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
-                    echo "          (system-library-directory-pathname)))" ) \
-                  | ${MIT_SCHEME_EXE} --batch-mode`
-MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
-                        echo "          (directory-pathname" ;\
-                        echo "           (system-library-pathname" ;\
-                        echo '            "mit-scheme.h"))))' ) \
-                      | ${MIT_SCHEME_EXE} --batch-mode`
-MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-                     | ${MIT_SCHEME_EXE} --batch-mode`
+if test x"${MIT_SCHEME_LIBDIR}" = x; then
+    MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+                        echo "          (system-library-directory-pathname)))" ) \
+                      | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+fi
+if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
+    MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
+                             echo "          (directory-pathname" ;\
+                             echo "           (system-library-pathname" ;\
+                             echo '            "mit-scheme.h"))))' ) \
+                           | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+fi
+if test x"${MIT_SCHEME_PKD}" = x; then
+    os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
+              | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+    MIT_SCHEME_PKD="gl-${os_suffix}.pkd"
+fi
 
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_CFLAGS])
 AC_SUBST([MIT_SCHEME_LIBDIR])
 AC_SUBST([MIT_SCHEME_INCLUDEDIR])
-AC_SUBST([MIT_SCHEME_OS_SUFFIX])
+AC_SUBST([MIT_SCHEME_PKD])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/src/glib/Makefile.am b/src/glib/Makefile.am
index 945bb15decae3e48ba63fcad51213bbf38e0dfae..74cb32809e09cd999fc41feae07b6be696ef4d81 100644 (file)
--- a/src/glib/Makefile.am
+++ b/src/glib/Makefile.am
@@ -43,7 +43,7 @@ binaries += glib-thread.bci glib-thread.com
 
 scmlib_sub_DATA = $(sources)
 scmlib_sub_DATA += $(binaries)
-scmlib_sub_DATA += make.scm glib.pkg glib-@MIT_SCHEME_OS_SUFFIX@.pkd
+scmlib_sub_DATA += make.scm glib.pkg @MIT_SCHEME_PKD@
 
 scminfo_DATA = glib.info
 info_TEXINFOS = glib.texi
@@ -88,7 +88,7 @@ glib-main.bci: stamp-scheme
 glib-main.com: stamp-scheme
 glib-thread.bci: stamp-scheme
 glib-thread.com: stamp-scheme
-glib-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+@MIT_SCHEME_PKD@: stamp-scheme
 stamp-scheme: stamp-shim $(sources) glib-const.bin glib.pkg
        touch stamp-scheme
        if ! ./compile.sh; then rm stamp-scheme; exit 1; fi

diff --git a/src/glib/configure.ac b/src/glib/configure.ac
index ee238da0546c6c21f9ec9d35788d79deb066fe2d..9dd03a2748e231a6a853c2d7cda9036d3b8385f2 100644 (file)
--- a/src/glib/configure.ac
+++ b/src/glib/configure.ac
@@ -108,22 +108,29 @@ fi
 
 MIT_SCHEME_PROJECT=mit-scheme-pucked
 : ${MIT_SCHEME_EXE=mit-scheme}
-MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
-                    echo "          (system-library-directory-pathname)))" ) \
-                  | ${MIT_SCHEME_EXE} --batch-mode`
-MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
-                        echo "          (directory-pathname" ;\
-                        echo "           (system-library-pathname" ;\
-                        echo '            "mit-scheme.h"))))' ) \
-                      | ${MIT_SCHEME_EXE} --batch-mode`
-MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-                     | ${MIT_SCHEME_EXE} --batch-mode`
+if test x"${MIT_SCHEME_LIBDIR}" = x; then
+    MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+                        echo "          (system-library-directory-pathname)))" ) \
+                        | ${MIT_SCHEME_EXE} --batch-mode`
+fi
+if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
+    MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
+                            echo "          (directory-pathname" ;\
+                            echo "           (system-library-pathname" ;\
+                            echo '            "mit-scheme.h"))))' ) \
+                          | ${MIT_SCHEME_EXE} --batch-mode`
+fi
+if test x"${MIT_SCHEME_PKD}" = x; then
+    os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
+              | ${MIT_SCHEME_EXE} --batch-mode`
+    MIT_SCHEME_PKD="blowfish-${os_suffix}.pkd"
+fi
 
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_CFLAGS])
 AC_SUBST([MIT_SCHEME_LIBDIR])
 AC_SUBST([MIT_SCHEME_INCLUDEDIR])
-AC_SUBST([MIT_SCHEME_OS_SUFFIX])
+AC_SUBST([MIT_SCHEME_PKD])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/src/gtk-screen/Makefile.am b/src/gtk-screen/Makefile.am
index 921d482a76b962f791ca1faa358eec6c8ddb8161..fcf762190550e95300e27fb30fa2247fca3c30ed 100644 (file)
--- a/src/gtk-screen/Makefile.am
+++ b/src/gtk-screen/Makefile.am
@@ -34,7 +34,7 @@ scmlib_sub_DATA = $(sources)
 scmlib_sub_DATA += gtk-screen.bin gtk-screen.bci gtk-screen.com
 scmlib_sub_DATA += gtk-faces.bin gtk-faces.bci gtk-faces.com
 scmlib_sub_DATA += make.scm gtk-screen.pkg
-scmlib_sub_DATA += gtk-screen-@MIT_SCHEME_OS_SUFFIX@.pkd
+scmlib_sub_DATA += @MIT_SCHEME_PKD@
 
 #scminfo_DATA = gtk-screen.info
 #info_TEXINFOS = gtk-screen.texi
@@ -47,7 +47,7 @@ gtk-screen.com: stamp-scheme
 gtk-faces.bin: stamp-scheme
 gtk-faces.bci: stamp-scheme
 gtk-faces.com: stamp-scheme
-gtk-screen-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+@MIT_SCHEME_PKD@: stamp-scheme
 stamp-scheme: $(sources) gtk-screen.pkg
        touch stamp-scheme
        if ! ./compile.sh; then rm stamp-scheme; exit 1; fi

diff --git a/src/gtk-screen/configure.ac b/src/gtk-screen/configure.ac
index 9fb17f11144c0b9317873cce1c1e17dd4d9c5fff..c60805db85cf21c58499c8b8485f1ef0cd3fd50a 100644 (file)
--- a/src/gtk-screen/configure.ac
+++ b/src/gtk-screen/configure.ac
@@ -41,15 +41,20 @@ AC_PROG_INSTALL
 
 MIT_SCHEME_PROJECT=mit-scheme-pucked
 : ${MIT_SCHEME_EXE=mit-scheme}
-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`
+if test x"${MIT_SCHEME_LIBDIR}" = x; then
+    MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+                        echo "          (system-library-directory-pathname)))" ) \
+                        | ${MIT_SCHEME_EXE} --batch-mode`
+fi
+if test x"${MIT_SCHEME_PKD}" = x; then
+    os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
+              | ${MIT_SCHEME_EXE} --batch-mode`
+    MIT_SCHEME_PKD="gtk-screen-${os_suffix}.pkd"
+fi
 
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])
-AC_SUBST([MIT_SCHEME_OS_SUFFIX])
+AC_SUBST([MIT_SCHEME_PKD])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
index da623783b3dbd221004be56a28d6644159da3a67..68bf4692878d1f5e0784795f091bf0b755e7e1ed 100644 (file)
--- a/src/gtk/Makefile.am
+++ b/src/gtk/Makefile.am
@@ -53,7 +53,7 @@ binaries += swat-pole-zero.bci swat-pole-zero.com
 
 scmlib_sub_DATA = $(sources)
 scmlib_sub_DATA += $(binaries)
-scmlib_sub_DATA += make.scm gtk.pkg gtk-@MIT_SCHEME_OS_SUFFIX@.pkd
+scmlib_sub_DATA += make.scm gtk.pkg @MIT_SCHEME_PKD@
 
 scminfo_DATA = gtk.info
 info_TEXINFOS = gtk.texi
@@ -116,7 +116,7 @@ swat.bci: stamp-scheme
 swat.com: stamp-scheme
 swat-pole-zero.bci: stamp-scheme
 swat-pole-zero.com: stamp-scheme
-gtk-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+@MIT_SCHEME_PKD@: stamp-scheme
 stamp-scheme: stamp-shim $(sources) gtk-const.bin gtk.pkg
        touch stamp-scheme
        if ! ./compile.sh; then rm stamp-scheme; exit 1; fi

diff --git a/src/gtk/configure.ac b/src/gtk/configure.ac
index 601728a64618e9d01758e9c49464898d0c73d1ff..7867de6d2707b18d26d254f9511976b86eddf77b 100644 (file)
--- a/src/gtk/configure.ac
+++ b/src/gtk/configure.ac
@@ -136,22 +136,29 @@ fi
 
 MIT_SCHEME_PROJECT=mit-scheme-pucked
 : ${MIT_SCHEME_EXE=mit-scheme}
-MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
-                    echo "          (system-library-directory-pathname)))" ) \
-                  | ${MIT_SCHEME_EXE} --batch-mode`
-MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
-                        echo "          (directory-pathname" ;\
-                        echo "           (system-library-pathname" ;\
-                        echo '            "mit-scheme.h"))))' ) \
-                      | ${MIT_SCHEME_EXE} --batch-mode`
-MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-                     | ${MIT_SCHEME_EXE} --batch-mode`
+if test x"${MIT_SCHEME_LIBDIR}" = x; then
+    MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+                        echo "          (system-library-directory-pathname)))" ) \
+                      | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+fi
+if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
+    MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
+                             echo "          (directory-pathname" ;\
+                             echo "           (system-library-pathname" ;\
+                             echo '            "mit-scheme.h"))))' ) \
+                           | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+fi
+if test x"${MIT_SCHEME_PKD}" = x; then
+    os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
+              | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+    MIT_SCHEME_PKD="gtk-${os_suffix}.pkd"
+fi
 
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_CFLAGS])
 AC_SUBST([MIT_SCHEME_LIBDIR])
 AC_SUBST([MIT_SCHEME_INCLUDEDIR])
-AC_SUBST([MIT_SCHEME_OS_SUFFIX])
+AC_SUBST([MIT_SCHEME_PKD])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/src/pango/Makefile.am b/src/pango/Makefile.am
index 92b25404a206d5021bc5ef62cc91150e78e6b81f..9b9ba2380332dadd1d9083166558e58bab8cf566 100644 (file)
--- a/src/pango/Makefile.am
+++ b/src/pango/Makefile.am
@@ -39,7 +39,7 @@ binaries = pango.bci pango.com
 
 scmlib_sub_DATA = $(sources)
 scmlib_sub_DATA += $(binaries)
-scmlib_sub_DATA += make.scm pango.pkg pango-@MIT_SCHEME_OS_SUFFIX@.pkd
+scmlib_sub_DATA += make.scm pango.pkg @MIT_SCHEME_PKD@
 
 scminfo_DATA = pango.info
 info_TEXINFOS = pango.texi
@@ -74,7 +74,7 @@ pango-const.scm: pango-const
 
 pango.bci: stamp-scheme
 pango.com: stamp-scheme
-pango-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+@MIT_SCHEME_PKD@: stamp-scheme
 stamp-scheme: stamp-shim $(sources) pango-const.bin pango.pkg
        touch stamp-scheme
        if ! ./compile.sh; then rm stamp-scheme; exit 1; fi

diff --git a/src/pango/configure.ac b/src/pango/configure.ac
index 2b2b0cab56f1789660ca4dfb4b57970ed0387edf..3298b23062caed0c10e2ebab0076f0cd9d33224a 100644 (file)
--- a/src/pango/configure.ac
+++ b/src/pango/configure.ac
@@ -108,22 +108,29 @@ fi
 
 MIT_SCHEME_PROJECT=mit-scheme-pucked
 : ${MIT_SCHEME_EXE=mit-scheme}
-MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
-                    echo "          (system-library-directory-pathname)))" ) \
-                  | ${MIT_SCHEME_EXE} --batch-mode`
-MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
-                        echo "          (directory-pathname" ;\
-                        echo "           (system-library-pathname" ;\
-                        echo '            "mit-scheme.h"))))' ) \
-                      | ${MIT_SCHEME_EXE} --batch-mode`
-MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-                     | ${MIT_SCHEME_EXE} --batch-mode`
+if test x"${MIT_SCHEME_LIBDIR}" = x; then
+    MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+                        echo "          (system-library-directory-pathname)))" ) \
+                      | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+fi
+if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
+    MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
+                             echo "          (directory-pathname" ;\
+                             echo "           (system-library-pathname" ;\
+                             echo '            "mit-scheme.h"))))' ) \
+                           | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+fi
+if test x"${MIT_SCHEME_PKD}" = x; then
+    os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
+              | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+    MIT_SCHEME_PKD="pango-${os_suffix}.pkd"
+fi
 
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_CFLAGS])
 AC_SUBST([MIT_SCHEME_LIBDIR])
 AC_SUBST([MIT_SCHEME_INCLUDEDIR])
-AC_SUBST([MIT_SCHEME_OS_SUFFIX])
+AC_SUBST([MIT_SCHEME_PKD])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/src/planetarium/Makefile.am b/src/planetarium/Makefile.am
index 1149311ece4f5bc91229df7915a1f64f4b17452d..e9438f109a3a5c1911601f385a2d009bf5675815 100644 (file)
--- a/src/planetarium/Makefile.am
+++ b/src/planetarium/Makefile.am
@@ -52,8 +52,8 @@ binaries += time.bci time.com
 
 scmlib_sub_DATA = $(sources)
 scmlib_sub_DATA += $(binaries)
-scmlib_sub_DATA += make.scm mit.pkg mit-@MIT_SCHEME_OS_SUFFIX@.pkd
-scmlib_sub_DATA += mit-link.scm mit-3d.pkg mit-3d-@MIT_SCHEME_OS_SUFFIX@.pkd
+scmlib_sub_DATA += make.scm mit.pkg @MIT_SCHEME_PKD@
+scmlib_sub_DATA += mit-link.scm mit-3d.pkg @MIT_SCHEME_3D_PKD@
 
 scminfo_DATA = planetarium.info
 info_TEXINFOS = planetarium.texi
@@ -95,8 +95,8 @@ terrain.bci: stamp-scheme
 terrain.com: stamp-scheme
 time.bci: stamp-scheme
 time.com: stamp-scheme
-mit-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
-mit-3d-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+@MIT_SCHEME_PKD@: stamp-scheme
+@MIT_SCHEME_3D_PKD@: stamp-scheme
 stamp-scheme: $(sources) mit.pkg mit-3d.pkg
        touch stamp-scheme
        if ! ./mit-compile.sh; then rm stamp-scheme; exit 1; fi

diff --git a/src/planetarium/configure.ac b/src/planetarium/configure.ac
index b67664364fab37cbb40cf5a3e7b6e1b23372a47e..dded75a42914bfdf50acd24e1a88a9f43e3fb45f 100644 (file)
--- a/src/planetarium/configure.ac
+++ b/src/planetarium/configure.ac
@@ -41,15 +41,21 @@ AC_PROG_INSTALL
 
 MIT_SCHEME_PROJECT=mit-scheme-pucked
 : ${MIT_SCHEME_EXE=mit-scheme}
-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`
-
+if test x"${MIT_SCHEME_LIBDIR}" = x; then
+    MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+                        echo "          (system-library-directory-pathname)))" ) \
+                        | ${MIT_SCHEME_EXE} --batch-mode`
+fi
+if test x"${MIT_SCHEME_PKD}" = x; then
+    os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
+              | ${MIT_SCHEME_EXE} --batch-mode`
+    MIT_SCHEME_PKD="mit-${os_suffix}.pkd"
+    MIT_SCHEME_3D_PKD="mit-3d-${os_suffix}.pkd"
+fi
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])
-AC_SUBST([MIT_SCHEME_OS_SUFFIX])
+AC_SUBST([MIT_SCHEME_PKD])
+AC_SUBST([MIT_SCHEME_3D_PKD])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT