From 6a5bf74386f8c2509747a62e09e4602ea90fe941 Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Wed, 7 Aug 2019 11:44:23 -0700
Subject: [PATCH] Fix definition of MIT_SCHEME_PKD; use _OS_SUFFIX from
 src/configure.

---
 src/blowfish/configure.ac   | 9 +++++----
 src/edwin/configure.ac      | 9 +++++----
 src/gdbm/configure.ac       | 9 +++++----
 src/imail/configure.ac      | 9 +++++----
 src/mcrypt/configure.ac     | 9 +++++----
 src/pgsql/configure.ac      | 9 +++++----
 src/x11-screen/configure.ac | 9 +++++----
 src/x11/configure.ac        | 9 +++++----
 8 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/src/blowfish/configure.ac b/src/blowfish/configure.ac
index 07200d705..8e76f621c 100644
--- 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 9472577d2..838d22700 100644
--- 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 c111e3908..11266e320 100644
--- 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 1d7cb62a7..b89ca6426 100644
--- 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 42d4a6103..3fc0ae6d8 100644
--- 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 42ebf55dc..234fc9396 100644
--- 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 447d2e6f8..54b336b45 100644
--- 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 205e83642..84f89771e 100644
--- 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"
-- 
2.25.1