Fix definition of MIT_SCHEME_PKD; use _OS_SUFFIX from src/configure.

diff --git a/src/blowfish/configure.ac b/src/blowfish/configure.ac
index 07200d705fbe2b324335f7b0094368736ce8856a..8e76f621cfa64aa0b74a82aa57394f1f59c7cf70 100644 (file)
--- a/src/blowfish/configure.ac
+++ b/src/blowfish/configure.ac
@@ -136,16 +136,17 @@ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
                              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="blowfish-${os_suffix}.pkd"
+if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
 if test x"${MIT_SCHEME_CC_TYPE}" = x; then
     MIT_SCHEME_CC_TYPE=`echo "(display microcode-id/compiled-code-type)" \
                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="blowfish-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 for f in blowfish; do
     MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
     MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci"

diff --git a/src/edwin/configure.ac b/src/edwin/configure.ac
index 9472577d287d3ba388cb8937633cbb3a2ab042e6..838d227005b4662052c85e9214bb6421193e7326 100644 (file)
--- a/src/edwin/configure.ac
+++ b/src/edwin/configure.ac
@@ -41,12 +41,13 @@ if test x"${MIT_SCHEME_LIBDIR}" = x; then
                         echo "          (system-library-directory-pathname)))" ) \
                       | ${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="edwin-${os_suffix}.pkd"
+if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="edwin-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_TOOLCHAIN_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])

diff --git a/src/gdbm/configure.ac b/src/gdbm/configure.ac
index c111e3908dc400f103f895408f7b606409b01756..11266e32072a7998d62fca42e5108df452cce25e 100644 (file)
--- a/src/gdbm/configure.ac
+++ b/src/gdbm/configure.ac
@@ -91,16 +91,17 @@ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
                              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="gdbm-${os_suffix}.pkd"
+if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
 if test x"${MIT_SCHEME_CC_TYPE}" = x; then
     MIT_SCHEME_CC_TYPE=`echo "(display microcode-id/compiled-code-type)" \
                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="gdbm-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 for f in gdbm; do
     MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
     MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci"

diff --git a/src/imail/configure.ac b/src/imail/configure.ac
index 1d7cb62a71bd3c58c3f48b4574f80a13e2443630..b89ca6426efb080fd305284a2dc92e2586d21cf2 100644 (file)
--- a/src/imail/configure.ac
+++ b/src/imail/configure.ac
@@ -41,12 +41,13 @@ if test x"${MIT_SCHEME_LIBDIR}" = x; then
                         echo "          (system-library-directory-pathname)))" ) \
                       | ${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="imail-${os_suffix}.pkd"
+if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="imail-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 # Install plugin docs in Scheme's docdir.
 docdir='$(datarootdir)/doc/$(MIT_SCHEME_PROJECT)'
 

diff --git a/src/mcrypt/configure.ac b/src/mcrypt/configure.ac
index 42d4a61036eadf5606770609f7dd0a04f31d892a..3fc0ae6d805d43e8bd01933541677508af926b06 100644 (file)
--- a/src/mcrypt/configure.ac
+++ b/src/mcrypt/configure.ac
@@ -121,16 +121,17 @@ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
                              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="mcrypt-${os_suffix}.pkd"
+if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
 if test x"${MIT_SCHEME_CC_TYPE}" = x; then
     MIT_SCHEME_CC_TYPE=`echo "(display microcode-id/compiled-code-type)" \
                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="mcrypt-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 for f in mcrypt; do
     MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
     MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci"

diff --git a/src/pgsql/configure.ac b/src/pgsql/configure.ac
index 42ebf55dceff0c3d0a10b933831f64ee7d3a4ccb..234fc939688c06391a8e55ef2fc08e51d2852bc5 100644 (file)
--- a/src/pgsql/configure.ac
+++ b/src/pgsql/configure.ac
@@ -122,16 +122,17 @@ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
                              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="pgsql-${os_suffix}.pkd"
+if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
 if test x"${MIT_SCHEME_CC_TYPE}" = x; then
     MIT_SCHEME_CC_TYPE=`echo "(display microcode-id/compiled-code-type)" \
                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="pgsql-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 for f in pgsql; do
     MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
     MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci"

diff --git a/src/x11-screen/configure.ac b/src/x11-screen/configure.ac
index 447d2e6f89a8d4618f1978abe2144424fe0e5355..54b336b45bec7f5e38b6530519d4b40715b29022 100644 (file)
--- a/src/x11-screen/configure.ac
+++ b/src/x11-screen/configure.ac
@@ -41,16 +41,17 @@ if test x"${MIT_SCHEME_LIBDIR}" = x; then
                         echo "          (system-library-directory-pathname)))" ) \
                       | ${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="x11-screen-${os_suffix}.pkd"
+if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
 if test x"${MIT_SCHEME_CC_TYPE}" = x; then
     MIT_SCHEME_CC_TYPE=`echo "(display microcode-id/compiled-code-type)" \
                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="x11-screen-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 for f in x11-screen x11-key x11-command; do
     MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
     MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci"

diff --git a/src/x11/configure.ac b/src/x11/configure.ac
index 205e836421a2431d50e7faae6aca480f19758634..84f89771e393fee4b59f064bafcef49735c93f9e 100644 (file)
--- a/src/x11/configure.ac
+++ b/src/x11/configure.ac
@@ -113,16 +113,17 @@ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
                              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="x11-${os_suffix}.pkd"
+if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
 if test x"${MIT_SCHEME_CC_TYPE}" = x; then
     MIT_SCHEME_CC_TYPE=`echo "(display microcode-id/compiled-code-type)" \
                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="x11-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 for f in x11-base x11-color x11-graphics x11-terminal x11-device; do
     MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
     MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci"