From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Thu, 8 Aug 2019 07:07:16 +0000 (-0700)
Subject: Pucked plugin builds: Define MIT_SCHEME_PKD as standard plugins do.
X-Git-Tag: mit-scheme-pucked-10.1.20~14
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=f0e0b6253edf6e895fdbe4333ebc4609f4d6cb67;p=mit-scheme.git

Pucked plugin builds: Define MIT_SCHEME_PKD as standard plugins do.
---

diff --git a/src/cairo/configure.ac b/src/cairo/configure.ac
index df4916b50..ad7cbea91 100644
--- a/src/cairo/configure.ac
+++ b/src/cairo/configure.ac
@@ -120,16 +120,17 @@ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
 			     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_TOOLCHAIN_EXE} --batch-mode`
-    MIT_SCHEME_PKD="cairo-${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_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`
+                        | ${MIT_SCHEME_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="cairo-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_CFLAGS])
diff --git a/src/devops/configure.ac b/src/devops/configure.ac
index b38d68741..3f9bcc24a 100644
--- a/src/devops/configure.ac
+++ b/src/devops/configure.ac
@@ -47,12 +47,13 @@ if test x"${MIT_SCHEME_LIBDIR}" = x; then
 			 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"
+if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+			  | ${MIT_SCHEME_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="devops-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])
diff --git a/src/gl/configure.ac b/src/gl/configure.ac
index f7f9949c6..3fdfe2e41 100644
--- a/src/gl/configure.ac
+++ b/src/gl/configure.ac
@@ -111,21 +111,22 @@ MIT_SCHEME_PROJECT=mit-scheme-pucked
 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`
+		       | ${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_TOOLCHAIN_EXE} --batch-mode`
+			     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_TOOLCHAIN_EXE} --batch-mode`
-    MIT_SCHEME_PKD="gl-${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_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="gl-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_CFLAGS])
diff --git a/src/glib/configure.ac b/src/glib/configure.ac
index 536202b9f..2a5a0e517 100644
--- a/src/glib/configure.ac
+++ b/src/glib/configure.ac
@@ -111,7 +111,7 @@ MIT_SCHEME_PROJECT=mit-scheme-pucked
 if test x"${MIT_SCHEME_LIBDIR}" = x; then
     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
 			 echo "          (system-library-directory-pathname)))" ) \
-			 | ${MIT_SCHEME_EXE} --batch-mode`
+		       | ${MIT_SCHEME_EXE} --batch-mode`
 fi
 if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
     MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
@@ -120,12 +120,13 @@ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
 			     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="glib-${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_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="glib-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_CFLAGS])
diff --git a/src/gtk-screen/configure.ac b/src/gtk-screen/configure.ac
index c60805db8..1bd2aebcf 100644
--- a/src/gtk-screen/configure.ac
+++ b/src/gtk-screen/configure.ac
@@ -44,14 +44,15 @@ MIT_SCHEME_PROJECT=mit-scheme-pucked
 if test x"${MIT_SCHEME_LIBDIR}" = x; then
     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
 			 echo "          (system-library-directory-pathname)))" ) \
-			 | ${MIT_SCHEME_EXE} --batch-mode`
+		       | ${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"
+if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+			  | ${MIT_SCHEME_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="gtk-screen-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])
diff --git a/src/gtk/configure.ac b/src/gtk/configure.ac
index 7867de6d2..331e92570 100644
--- a/src/gtk/configure.ac
+++ b/src/gtk/configure.ac
@@ -139,21 +139,22 @@ MIT_SCHEME_PROJECT=mit-scheme-pucked
 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`
+		       | ${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_TOOLCHAIN_EXE} --batch-mode`
+			     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_TOOLCHAIN_EXE} --batch-mode`
-    MIT_SCHEME_PKD="gtk-${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_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="gtk-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_CFLAGS])
diff --git a/src/pango/configure.ac b/src/pango/configure.ac
index 3298b2306..bf1a4edcd 100644
--- a/src/pango/configure.ac
+++ b/src/pango/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([MIT/GNU Scheme Pucked pango plugin],
+AC_INIT([MIT/GNU Scheme Pucked Pango plugin],
         [0.12],
         [matt@birchwood-abbey.net],
         [mit-scheme-pucked-pango])
@@ -111,21 +111,22 @@ MIT_SCHEME_PROJECT=mit-scheme-pucked
 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`
+		       | ${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_TOOLCHAIN_EXE} --batch-mode`
+                           | ${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_TOOLCHAIN_EXE} --batch-mode`
-    MIT_SCHEME_PKD="pango-${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_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="pango-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_CFLAGS])
diff --git a/src/planetarium/configure.ac b/src/planetarium/configure.ac
index dded75a42..c7e402876 100644
--- a/src/planetarium/configure.ac
+++ b/src/planetarium/configure.ac
@@ -46,12 +46,14 @@ if test x"${MIT_SCHEME_LIBDIR}" = x; then
 			 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))" \
+if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+    MIT_SCHEME_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
+
+MIT_SCHEME_PKD="mit-${MIT_SCHEME_OS_SUFFIX}.pkd"
+MIT_SCHEME_3D_PKD="mit-3d-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])