From 6c34ca59759efa3bcdbd44d2c3ae78afba083c8e Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Sun, 4 Aug 2019 13:52:47 -0700
Subject: [PATCH] Plugin builds: Use MIT_SCHEME_PKD, not MIT_SCHEME_OS_SUFFIX.

---
 src/blowfish/configure.ac   | 9 ++++-----
 src/edwin/Makefile.am       | 4 ++--
 src/edwin/configure.ac      | 9 +++++----
 src/gdbm/configure.ac       | 9 ++++-----
 src/imail/Makefile.am       | 4 ++--
 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 ++++-----
 10 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/src/blowfish/configure.ac b/src/blowfish/configure.ac
index fdb7974dd..07200d705 100644
--- a/src/blowfish/configure.ac
+++ b/src/blowfish/configure.ac
@@ -136,17 +136,16 @@ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
                              echo '            "mit-scheme.h"))))' ) \
                            | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
-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`
+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"
 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/Makefile.am b/src/edwin/Makefile.am
index d05a607db..76cbba942 100644
--- a/src/edwin/Makefile.am
+++ b/src/edwin/Makefile.am
@@ -33,7 +33,7 @@ scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@
 scmlib_sub_DATA = $(sources)
 scmlib_sub_DATA += $(binaries)
 scmlib_sub_DATA += loadef.scm edwin.bld
-scmlib_sub_DATA += make.scm edwin.pkg edwin-@MIT_SCHEME_OS_SUFFIX@.pkd
+scmlib_sub_DATA += make.scm edwin.pkg @MIT_SCHEME_PKD@
 scmlib_sub_DATA += TUTORIAL
 
 #info_TEXINFOS = mit-scheme-edwin.texi
@@ -41,7 +41,7 @@ scmlib_sub_DATA += TUTORIAL
 
 include $(srcdir)/source-dependencies.am
 edwin.bld: stamp-scheme
-edwin-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+@MIT_SCHEME_PKD@: stamp-scheme
 stamp-scheme: $(sources) edwin.ldr edwin.pkg
 	MIT_SCHEME_EXE=$(MIT_SCHEME_EXE) ./compile.sh
 	echo "done" > $@
diff --git a/src/edwin/configure.ac b/src/edwin/configure.ac
index 4fbc5fc16..9472577d2 100644
--- a/src/edwin/configure.ac
+++ b/src/edwin/configure.ac
@@ -41,14 +41,15 @@ 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_OS_SUFFIX}" = x; then
-    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-                          | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+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"
 fi
 
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_TOOLCHAIN_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/gdbm/configure.ac b/src/gdbm/configure.ac
index 78e8cc890..c111e3908 100644
--- a/src/gdbm/configure.ac
+++ b/src/gdbm/configure.ac
@@ -91,17 +91,16 @@ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
                              echo '            "mit-scheme.h"))))' ) \
                            | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
-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`
+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"
 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/Makefile.am b/src/imail/Makefile.am
index d45e2f255..6da398fa1 100644
--- a/src/imail/Makefile.am
+++ b/src/imail/Makefile.am
@@ -49,7 +49,7 @@ binaries += imap-syntax.bci imap-syntax.com
 
 scmlib_sub_DATA = $(sources)
 scmlib_sub_DATA += $(binaries)
-scmlib_sub_DATA += make.scm imail.pkg imail-@MIT_SCHEME_OS_SUFFIX@.pkd
+scmlib_sub_DATA += make.scm imail.pkg @MIT_SCHEME_PKD@
 
 info_TEXINFOS = mit-scheme-imail.texi
 AM_MAKEINFOHTMLFLAGS = --no-split
@@ -78,7 +78,7 @@ imap-response.bci: stamp-scheme
 imap-response.com: stamp-scheme
 imap-syntax.bci: stamp-scheme
 imap-syntax.com: stamp-scheme
-imail-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+@MIT_SCHEME_PKD@: stamp-scheme
 stamp-scheme: $(sources) imail.pkg
 	MIT_SCHEME_EXE=$(MIT_SCHEME_EXE) ./compile.sh
 	echo "done" > $@
diff --git a/src/imail/configure.ac b/src/imail/configure.ac
index c61e49bb6..1d7cb62a7 100644
--- a/src/imail/configure.ac
+++ b/src/imail/configure.ac
@@ -41,9 +41,10 @@ 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_OS_SUFFIX}" = x; then
-    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-                          | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+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"
 fi
 
 # Install plugin docs in Scheme's docdir.
@@ -52,6 +53,6 @@ docdir='$(datarootdir)/doc/$(MIT_SCHEME_PROJECT)'
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_TOOLCHAIN_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/mcrypt/configure.ac b/src/mcrypt/configure.ac
index 3a271d7ee..42d4a6103 100644
--- a/src/mcrypt/configure.ac
+++ b/src/mcrypt/configure.ac
@@ -121,17 +121,16 @@ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
                              echo '            "mit-scheme.h"))))' ) \
                            | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
-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`
+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"
 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 fa6b1129b..42ebf55dc 100644
--- a/src/pgsql/configure.ac
+++ b/src/pgsql/configure.ac
@@ -122,17 +122,16 @@ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
                              echo '            "mit-scheme.h"))))' ) \
                            | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
-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`
+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"
 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 49550bfcc..447d2e6f8 100644
--- a/src/x11-screen/configure.ac
+++ b/src/x11-screen/configure.ac
@@ -41,17 +41,16 @@ 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_OS_SUFFIX}" = x; then
-    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-                          | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+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"
 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 d7070ad56..205e83642 100644
--- a/src/x11/configure.ac
+++ b/src/x11/configure.ac
@@ -113,17 +113,16 @@ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
                              echo '            "mit-scheme.h"))))' ) \
                            | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
 fi
-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`
+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"
 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