From: Matt Birkholz Date: Tue, 6 Aug 2019 21:20:24 +0000 (-0700) Subject: Pucked plugin builds: Use MIT_SCHEME_PKD, not MIT_SCHEME_OS_SUFFIX. X-Git-Tag: mit-scheme-pucked-10.1.20~19 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=29f4788bf919c55bfb6ffbd5b8e4a3b4e60a3821;p=mit-scheme.git Pucked plugin builds: Use MIT_SCHEME_PKD, not MIT_SCHEME_OS_SUFFIX. --- diff --git a/src/devops/Makefile.am b/src/devops/Makefile.am index fd80d4616..b8a23eedd 100644 --- a/src/devops/Makefile.am +++ b/src/devops/Makefile.am @@ -35,7 +35,7 @@ binaries += build.bin build.bci build.com binaries += lint.bin lint.bci lint.com scmlib_sub_DATA = $(sources) $(binaries) -scmlib_sub_DATA += make.scm devops.pkg devops-@MIT_SCHEME_OS_SUFFIX@.pkd +scmlib_sub_DATA += make.scm devops.pkg @MIT_SCHEME_PKD@ scminfo_DATA = devops.info info_TEXINFOS = devops.texi @@ -52,7 +52,7 @@ build.com: stamp-scheme lint.bin: stamp-scheme lint.bci: stamp-scheme lint.com: stamp-scheme -devops-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme +@MIT_SCHEME_PKD@: stamp-scheme stamp-scheme: $(sources) devops.pkg touch stamp-scheme if ! ./compile.sh; then rm stamp-scheme; exit 1; fi diff --git a/src/devops/configure.ac b/src/devops/configure.ac index ae5d3031f..b38d68741 100644 --- a/src/devops/configure.ac +++ b/src/devops/configure.ac @@ -42,16 +42,20 @@ AC_PROG_INSTALL 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_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ - | ${MIT_SCHEME_EXE} --batch-mode` +if test x"${MIT_SCHEME_LIBDIR}" = x; then + MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\ + 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" +fi AC_SUBST([MIT_SCHEME_PROJECT]) AC_SUBST([MIT_SCHEME_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/gl/Makefile.am b/src/gl/Makefile.am index 4593f431d..ba7f91b2b 100644 --- a/src/gl/Makefile.am +++ b/src/gl/Makefile.am @@ -41,7 +41,7 @@ binaries += gl-glxgears.bci gl-glxgears.com scmlib_sub_DATA = $(sources) scmlib_sub_DATA += $(binaries) -scmlib_sub_DATA += make.scm gl.pkg gl-@MIT_SCHEME_OS_SUFFIX@.pkd +scmlib_sub_DATA += make.scm gl.pkg @MIT_SCHEME_PKD@ #scminfo_DATA = gl.info #info_TEXINFOS = gl.texi @@ -82,7 +82,7 @@ gl-glx.bci: stamp-scheme gl-glx.com: stamp-scheme gl-glxgears.bci: stamp-scheme gl-glxgears.com: stamp-scheme -gl-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme +@MIT_SCHEME_PKD@: stamp-scheme stamp-scheme: stamp-shim $(sources) gl-const.bin gl.pkg touch stamp-scheme if ! ./compile.sh; then rm stamp-scheme; exit 1; fi diff --git a/src/gl/configure.ac b/src/gl/configure.ac index 9080de136..f7f9949c6 100644 --- a/src/gl/configure.ac +++ b/src/gl/configure.ac @@ -108,22 +108,29 @@ 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"))))' ) \ - | ${MIT_SCHEME_EXE} --batch-mode` -MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ - | ${MIT_SCHEME_EXE} --batch-mode` +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` +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` +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" +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/glib/Makefile.am b/src/glib/Makefile.am index 945bb15de..74cb32809 100644 --- a/src/glib/Makefile.am +++ b/src/glib/Makefile.am @@ -43,7 +43,7 @@ binaries += glib-thread.bci glib-thread.com scmlib_sub_DATA = $(sources) scmlib_sub_DATA += $(binaries) -scmlib_sub_DATA += make.scm glib.pkg glib-@MIT_SCHEME_OS_SUFFIX@.pkd +scmlib_sub_DATA += make.scm glib.pkg @MIT_SCHEME_PKD@ scminfo_DATA = glib.info info_TEXINFOS = glib.texi @@ -88,7 +88,7 @@ glib-main.bci: stamp-scheme glib-main.com: stamp-scheme glib-thread.bci: stamp-scheme glib-thread.com: stamp-scheme -glib-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme +@MIT_SCHEME_PKD@: stamp-scheme stamp-scheme: stamp-shim $(sources) glib-const.bin glib.pkg touch stamp-scheme if ! ./compile.sh; then rm stamp-scheme; exit 1; fi diff --git a/src/glib/configure.ac b/src/glib/configure.ac index ee238da05..9dd03a274 100644 --- a/src/glib/configure.ac +++ b/src/glib/configure.ac @@ -108,22 +108,29 @@ 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"))))' ) \ - | ${MIT_SCHEME_EXE} --batch-mode` -MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ - | ${MIT_SCHEME_EXE} --batch-mode` +if test x"${MIT_SCHEME_LIBDIR}" = x; then + MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\ + echo " (system-library-directory-pathname)))" ) \ + | ${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_EXE} --batch-mode` + MIT_SCHEME_PKD="blowfish-${os_suffix}.pkd" +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/gtk-screen/Makefile.am b/src/gtk-screen/Makefile.am index 921d482a7..fcf762190 100644 --- a/src/gtk-screen/Makefile.am +++ b/src/gtk-screen/Makefile.am @@ -34,7 +34,7 @@ scmlib_sub_DATA = $(sources) scmlib_sub_DATA += gtk-screen.bin gtk-screen.bci gtk-screen.com scmlib_sub_DATA += gtk-faces.bin gtk-faces.bci gtk-faces.com scmlib_sub_DATA += make.scm gtk-screen.pkg -scmlib_sub_DATA += gtk-screen-@MIT_SCHEME_OS_SUFFIX@.pkd +scmlib_sub_DATA += @MIT_SCHEME_PKD@ #scminfo_DATA = gtk-screen.info #info_TEXINFOS = gtk-screen.texi @@ -47,7 +47,7 @@ gtk-screen.com: stamp-scheme gtk-faces.bin: stamp-scheme gtk-faces.bci: stamp-scheme gtk-faces.com: stamp-scheme -gtk-screen-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme +@MIT_SCHEME_PKD@: stamp-scheme stamp-scheme: $(sources) gtk-screen.pkg touch stamp-scheme if ! ./compile.sh; then rm stamp-scheme; exit 1; fi diff --git a/src/gtk-screen/configure.ac b/src/gtk-screen/configure.ac index 9fb17f111..c60805db8 100644 --- a/src/gtk-screen/configure.ac +++ b/src/gtk-screen/configure.ac @@ -41,15 +41,20 @@ AC_PROG_INSTALL 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_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ - | ${MIT_SCHEME_EXE} --batch-mode` +if test x"${MIT_SCHEME_LIBDIR}" = x; then + MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\ + 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="gtk-screen-${os_suffix}.pkd" +fi AC_SUBST([MIT_SCHEME_PROJECT]) AC_SUBST([MIT_SCHEME_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/gtk/Makefile.am b/src/gtk/Makefile.am index da623783b..68bf46928 100644 --- a/src/gtk/Makefile.am +++ b/src/gtk/Makefile.am @@ -53,7 +53,7 @@ binaries += swat-pole-zero.bci swat-pole-zero.com scmlib_sub_DATA = $(sources) scmlib_sub_DATA += $(binaries) -scmlib_sub_DATA += make.scm gtk.pkg gtk-@MIT_SCHEME_OS_SUFFIX@.pkd +scmlib_sub_DATA += make.scm gtk.pkg @MIT_SCHEME_PKD@ scminfo_DATA = gtk.info info_TEXINFOS = gtk.texi @@ -116,7 +116,7 @@ swat.bci: stamp-scheme swat.com: stamp-scheme swat-pole-zero.bci: stamp-scheme swat-pole-zero.com: stamp-scheme -gtk-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme +@MIT_SCHEME_PKD@: stamp-scheme stamp-scheme: stamp-shim $(sources) gtk-const.bin gtk.pkg touch stamp-scheme if ! ./compile.sh; then rm stamp-scheme; exit 1; fi diff --git a/src/gtk/configure.ac b/src/gtk/configure.ac index 601728a64..7867de6d2 100644 --- a/src/gtk/configure.ac +++ b/src/gtk/configure.ac @@ -136,22 +136,29 @@ 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"))))' ) \ - | ${MIT_SCHEME_EXE} --batch-mode` -MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ - | ${MIT_SCHEME_EXE} --batch-mode` +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` +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` +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" +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/pango/Makefile.am b/src/pango/Makefile.am index 92b25404a..9b9ba2380 100644 --- a/src/pango/Makefile.am +++ b/src/pango/Makefile.am @@ -39,7 +39,7 @@ binaries = pango.bci pango.com scmlib_sub_DATA = $(sources) scmlib_sub_DATA += $(binaries) -scmlib_sub_DATA += make.scm pango.pkg pango-@MIT_SCHEME_OS_SUFFIX@.pkd +scmlib_sub_DATA += make.scm pango.pkg @MIT_SCHEME_PKD@ scminfo_DATA = pango.info info_TEXINFOS = pango.texi @@ -74,7 +74,7 @@ pango-const.scm: pango-const pango.bci: stamp-scheme pango.com: stamp-scheme -pango-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme +@MIT_SCHEME_PKD@: stamp-scheme stamp-scheme: stamp-shim $(sources) pango-const.bin pango.pkg touch stamp-scheme if ! ./compile.sh; then rm stamp-scheme; exit 1; fi diff --git a/src/pango/configure.ac b/src/pango/configure.ac index 2b2b0cab5..3298b2306 100644 --- a/src/pango/configure.ac +++ b/src/pango/configure.ac @@ -108,22 +108,29 @@ 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"))))' ) \ - | ${MIT_SCHEME_EXE} --batch-mode` -MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ - | ${MIT_SCHEME_EXE} --batch-mode` +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` +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` +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" +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/planetarium/Makefile.am b/src/planetarium/Makefile.am index 1149311ec..e9438f109 100644 --- a/src/planetarium/Makefile.am +++ b/src/planetarium/Makefile.am @@ -52,8 +52,8 @@ binaries += time.bci time.com scmlib_sub_DATA = $(sources) scmlib_sub_DATA += $(binaries) -scmlib_sub_DATA += make.scm mit.pkg mit-@MIT_SCHEME_OS_SUFFIX@.pkd -scmlib_sub_DATA += mit-link.scm mit-3d.pkg mit-3d-@MIT_SCHEME_OS_SUFFIX@.pkd +scmlib_sub_DATA += make.scm mit.pkg @MIT_SCHEME_PKD@ +scmlib_sub_DATA += mit-link.scm mit-3d.pkg @MIT_SCHEME_3D_PKD@ scminfo_DATA = planetarium.info info_TEXINFOS = planetarium.texi @@ -95,8 +95,8 @@ terrain.bci: stamp-scheme terrain.com: stamp-scheme time.bci: stamp-scheme time.com: stamp-scheme -mit-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme -mit-3d-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme +@MIT_SCHEME_PKD@: stamp-scheme +@MIT_SCHEME_3D_PKD@: stamp-scheme stamp-scheme: $(sources) mit.pkg mit-3d.pkg touch stamp-scheme if ! ./mit-compile.sh; then rm stamp-scheme; exit 1; fi diff --git a/src/planetarium/configure.ac b/src/planetarium/configure.ac index b67664364..dded75a42 100644 --- a/src/planetarium/configure.ac +++ b/src/planetarium/configure.ac @@ -41,15 +41,21 @@ AC_PROG_INSTALL 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_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ - | ${MIT_SCHEME_EXE} --batch-mode` - +if test x"${MIT_SCHEME_LIBDIR}" = x; then + MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\ + 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="mit-${os_suffix}.pkd" + MIT_SCHEME_3D_PKD="mit-3d-${os_suffix}.pkd" +fi AC_SUBST([MIT_SCHEME_PROJECT]) AC_SUBST([MIT_SCHEME_EXE]) AC_SUBST([MIT_SCHEME_LIBDIR]) -AC_SUBST([MIT_SCHEME_OS_SUFFIX]) +AC_SUBST([MIT_SCHEME_PKD]) +AC_SUBST([MIT_SCHEME_3D_PKD]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT