Plugin build: use MIT_SCHEME_PKD rather than MIT_SCHEME_OS_SUFFIX.

diff --git a/src/blowfish/configure.ac b/src/blowfish/configure.ac
index 0eb3249e3676605ca6c99436c6a7ab44f79ee714..ec8a20bd93b96a623ac00ae441c2c574a760f7e3 100644 (file)
--- a/src/blowfish/configure.ac
+++ b/src/blowfish/configure.ac
@@ -152,17 +152,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/cairo/Makefile.am b/src/cairo/Makefile.am
index d1f0af1d17e61ddcd89a6261aab1e0bc5c0875c2..9dbcb84d8d965a873c97278ae97dd6483f613c10 100644 (file)
--- a/src/cairo/Makefile.am
+++ b/src/cairo/Makefile.am
@@ -40,7 +40,7 @@ binaries += cairo-graphics.bci cairo-graphics.com
 
 scmlib_sub_DATA = $(sources)
 scmlib_sub_DATA += $(binaries)
-scmlib_sub_DATA += make.scm cairo.pkg cairo-@MIT_SCHEME_OS_SUFFIX@.pkd
+scmlib_sub_DATA += make.scm cairo.pkg @MIT_SCHEME_OS_PKD@
 
 scminfo_DATA = cairo.info
 info_TEXINFOS = cairo.texi
@@ -77,7 +77,7 @@ cairo.bci: stamp-scheme
 cairo.com: stamp-scheme
 cairo-graphics.bci: stamp-scheme
 cairo-graphics.com: stamp-scheme
-cairo-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
+@MIT_SCHEME_PKD@: stamp-scheme
 stamp-scheme: stamp-shim $(sources) cairo.pkg
        touch stamp-scheme
        if ! ./compile.sh; then rm stamp-scheme; exit 1; fi

diff --git a/src/cairo/configure.ac b/src/cairo/configure.ac
index dcd6d9ccfe6ab38607b26029cb09f15152f438f1..df4916b503d0fbc679c5882f266040406444a057 100644 (file)
--- a/src/cairo/configure.ac
+++ b/src/cairo/configure.ac
@@ -108,22 +108,33 @@ 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"))))' ) \
+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_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-                     | ${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_TOOLCHAIN_EXE} --batch-mode`
+    MIT_SCHEME_PKD="cairo-${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
 
 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/edwin/configure.ac b/src/edwin/configure.ac
index 05d066d572dd464e19b3468ad80c21865cd4f538..47cdb516d694d11f43d6a554b60aaec300c3f30c 100644 (file)
--- a/src/edwin/configure.ac
+++ b/src/edwin/configure.ac
@@ -53,13 +53,12 @@ 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
 
-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 a917879d36d5eb73d07fcc1b0740cae209516ec7..04d98700b83b0356a4cd43da4ad5f5f4cbfe1f5c 100644 (file)
--- a/src/gdbm/configure.ac
+++ b/src/gdbm/configure.ac
@@ -103,17 +103,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 a1bb904febb561925fceb2bee954e647ba38f8ad..62d4bf9cf131c04f717d915f90463dd885808c1e 100644 (file)
--- a/src/imail/Makefile.am
+++ b/src/imail/Makefile.am
@@ -80,7 +80,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 1eaf840f8833d68f8dcf58d33714f4793cc7297a..159f854b979794189552ef5b1e195d1e51a145fc 100644 (file)
--- a/src/imail/configure.ac
+++ b/src/imail/configure.ac
@@ -53,13 +53,12 @@ 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
 
-MIT_SCHEME_PKD="imail-${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/mcrypt/configure.ac b/src/mcrypt/configure.ac
index 6b3b64f4d6040dd78799dd4466a174232157d37b..3ee1ae8e2c8d9536c9d00ff741daa11769960f87 100644 (file)
--- a/src/mcrypt/configure.ac
+++ b/src/mcrypt/configure.ac
@@ -137,17 +137,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 226686f7dc246b972aebfda106e98b86409f739c..4b795ca986d5c68dcf4153bc9d8cf31af1918caf 100644 (file)
--- a/src/pgsql/configure.ac
+++ b/src/pgsql/configure.ac
@@ -138,17 +138,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 9bfdb937a7719eeb4fabaa14a576305eda49daf0..4c82073994404dbc90deecd30816e11c7eab4ee7 100644 (file)
--- a/src/x11-screen/configure.ac
+++ b/src/x11-screen/configure.ac
@@ -53,17 +53,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 772af14af4f432f81c49aa036b6530bdd530ff68..47b22f8db11eb617c10779dacb87a44bba163418 100644 (file)
--- a/src/x11/configure.ac
+++ b/src/x11/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 x11 plugin],
+AC_INIT([MIT/GNU Scheme Pucked X11 plugin],
         [1.3.3],
         [matt@birchwood-abbey.net],
         [mit-scheme-pucked-x11])
@@ -125,17 +125,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"