From 701df207a7bda0b8f9c61647e1799272e4d680ed Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Mon, 22 Oct 2018 01:06:31 -0700 Subject: [PATCH] More changes so that installation works sort-of right. --- src/Makefile.in | 2 +- src/blowfish/configure.ac | 18 ++++++++++-------- src/configure.ac | 8 +++++++- src/edwin/configure.ac | 7 ++++--- src/gdbm/configure.ac | 18 ++++++++++-------- src/imail/configure.ac | 7 ++++--- src/mcrypt/configure.ac | 18 ++++++++++-------- src/pgsql/configure.ac | 18 ++++++++++-------- src/x11-screen/Makefile.am | 2 +- src/x11-screen/configure.ac | 8 ++++---- src/x11/configure.ac | 18 ++++++++++-------- 11 files changed, 71 insertions(+), 53 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 9285043cb..a3ad07fe7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -64,7 +64,7 @@ LIARC_BOOT_BUNDLES = compiler cref sf star-parser LIARC_BUNDLES = $(LIARC_BOOT_BUNDLES) ffi sos ssp xml SUBDIRS = $(INSTALLED_SUBDIRS) win32 xdoc -INSTALLED_SUBDIRS = microcode runtime $(LIARC_BUNDLES) +INSTALLED_SUBDIRS = microcode runtime $(OPTION_SUBDIRS) $(LIARC_BUNDLES) OPTION_SUBDIRS = @OPTION_SUBDIRS@ MIT_SCHEME_EXE = @MIT_SCHEME_EXE@ diff --git a/src/blowfish/configure.ac b/src/blowfish/configure.ac index 62ec85164..51ff03ecf 100644 --- a/src/blowfish/configure.ac +++ b/src/blowfish/configure.ac @@ -124,14 +124,16 @@ fi MIT_SCHEME_PROJECT=mit-scheme : ${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` +default_libdir=`( echo "(display (->namestring" ;\ + echo " (system-library-directory-pathname)))" ) \ + | ${MIT_SCHEME_EXE} --batch-mode` +: ${MIT_SCHEME_LIBDIR=${default_libdir}} +default_includedir=`( echo "(display (->namestring" ;\ + echo " (directory-pathname" ;\ + echo " (system-library-pathname" ;\ + echo ' "mit-scheme.h"))))' ) \ + | ${MIT_SCHEME_EXE} --batch-mode` +: ${MIT_SCHEME_INCLUDEDIR=${default_includedir}} cc_type=`echo "(display microcode-id/compiled-code-type)" \ | ${MIT_SCHEME_EXE} --batch-mode` diff --git a/src/configure.ac b/src/configure.ac index 34adfde50..007adb6cf 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -156,6 +156,8 @@ fi AUXDIR_NAME=mit-scheme-${mit_scheme_native_code} AUXDIR='$(libdir)'/${AUXDIR_NAME} +MIT_SCHEME_LIBDIR=${AUXDIR}/ +MIT_SCHEME_INCLUDEDIR=${AUXDIR}/ # Please keep the following messages synchronized with the messages in # these files: @@ -246,7 +248,6 @@ directory, which is usually \`/usr/local/lib/mit-scheme-${mit_scheme_native_code ]) fi fi -export MIT_SCHEME_EXE # A 32bit host running LIAR/svm needs a large heap. small_words='(= 4 (vector-ref (gc-space-status) 0))' @@ -341,6 +342,11 @@ etc/create-makefiles.sh "${MIT_SCHEME_EXE}" "${mit_scheme_compiler_target}" \ || exit $? compiler/configure "${mit_scheme_compiler_target}" || exit $? +# configure scripts for subdirs care about these +export MIT_SCHEME_EXE +export MIT_SCHEME_LIBDIR +export MIT_SCHEME_INCLUDEDIR + AC_CONFIG_SUBDIRS([microcode]) if test x"${enable_blowfish}" = xyes; then AC_CONFIG_SUBDIRS([blowfish]) diff --git a/src/edwin/configure.ac b/src/edwin/configure.ac index 187cf70c8..418722063 100644 --- a/src/edwin/configure.ac +++ b/src/edwin/configure.ac @@ -36,9 +36,10 @@ AC_PROG_INSTALL MIT_SCHEME_PROJECT=mit-scheme : ${MIT_SCHEME_EXE=mit-scheme} -MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\ - echo " (system-library-directory-pathname)))" ) \ - | ${MIT_SCHEME_EXE} --batch-mode` +default_libdir=`( echo "(display (->namestring" ;\ + echo " (system-library-directory-pathname)))" ) \ + | ${MIT_SCHEME_EXE} --batch-mode` +: ${MIT_SCHEME_LIBDIR=${default_libdir}} MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ | ${MIT_SCHEME_EXE} --batch-mode` MIT_SCHEME_SOURCES=`./sources.sh scm` diff --git a/src/gdbm/configure.ac b/src/gdbm/configure.ac index 73e4b5cf1..c5bf3443d 100644 --- a/src/gdbm/configure.ac +++ b/src/gdbm/configure.ac @@ -79,14 +79,16 @@ LIBS="-lgdbm" MIT_SCHEME_PROJECT=mit-scheme : ${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` +default_libdir=`( echo "(display (->namestring" ;\ + echo " (system-library-directory-pathname)))" ) \ + | ${MIT_SCHEME_EXE} --batch-mode` +: ${MIT_SCHEME_LIBDIR=${default_libdir}} +default_includedir=`( echo "(display (->namestring" ;\ + echo " (directory-pathname" ;\ + echo " (system-library-pathname" ;\ + echo ' "mit-scheme.h"))))' ) \ + | ${MIT_SCHEME_EXE} --batch-mode` +: ${MIT_SCHEME_INCLUDEDIR=${default_includedir}} cc_type=`echo "(display microcode-id/compiled-code-type)" \ | ${MIT_SCHEME_EXE} --batch-mode` diff --git a/src/imail/configure.ac b/src/imail/configure.ac index 62006b380..977c1b364 100644 --- a/src/imail/configure.ac +++ b/src/imail/configure.ac @@ -36,9 +36,10 @@ AC_PROG_INSTALL MIT_SCHEME_PROJECT=mit-scheme : ${MIT_SCHEME_EXE=mit-scheme} -MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\ - echo " (system-library-directory-pathname)))" ) \ - | ${MIT_SCHEME_EXE} --batch-mode` +default_libdir=`( echo "(display (->namestring" ;\ + echo " (system-library-directory-pathname)))" ) \ + | ${MIT_SCHEME_EXE} --batch-mode` +: ${MIT_SCHEME_LIBDIR=${default_libdir}} MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ | ${MIT_SCHEME_EXE} --batch-mode` diff --git a/src/mcrypt/configure.ac b/src/mcrypt/configure.ac index 54947a6f4..484c6293b 100644 --- a/src/mcrypt/configure.ac +++ b/src/mcrypt/configure.ac @@ -109,14 +109,16 @@ LIBS="${LIBS} ${MCRYPT_LIBS}" MIT_SCHEME_PROJECT=mit-scheme : ${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` +default_libdir=`( echo "(display (->namestring" ;\ + echo " (system-library-directory-pathname)))" ) \ + | ${MIT_SCHEME_EXE} --batch-mode` +: ${MIT_SCHEME_LIBDIR=${default_libdir}} +default_includedir=`( echo "(display (->namestring" ;\ + echo " (directory-pathname" ;\ + echo " (system-library-pathname" ;\ + echo ' "mit-scheme.h"))))' ) \ + | ${MIT_SCHEME_EXE} --batch-mode` +: ${MIT_SCHEME_INCLUDEDIR=${default_includedir}} cc_type=`echo "(display microcode-id/compiled-code-type)" \ | ${MIT_SCHEME_EXE} --batch-mode` diff --git a/src/pgsql/configure.ac b/src/pgsql/configure.ac index af5371d2d..d63b53632 100644 --- a/src/pgsql/configure.ac +++ b/src/pgsql/configure.ac @@ -110,14 +110,16 @@ AC_DEFINE([HAVE_LIBPQ_FE_H], [1], MIT_SCHEME_PROJECT=mit-scheme : ${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` +default_libdir=`( echo "(display (->namestring" ;\ + echo " (system-library-directory-pathname)))" ) \ + | ${MIT_SCHEME_EXE} --batch-mode` +: ${MIT_SCHEME_LIBDIR=${default_libdir}} +default_includedir=`( echo "(display (->namestring" ;\ + echo " (directory-pathname" ;\ + echo " (system-library-pathname" ;\ + echo ' "mit-scheme.h"))))' ) \ + | ${MIT_SCHEME_EXE} --batch-mode` +: ${MIT_SCHEME_INCLUDEDIR=${default_includedir}} cc_type=`echo "(display microcode-id/compiled-code-type)" \ | ${MIT_SCHEME_EXE} --batch-mode` diff --git a/src/x11-screen/Makefile.am b/src/x11-screen/Makefile.am index f748f9dab..1e6bc8c8b 100644 --- a/src/x11-screen/Makefile.am +++ b/src/x11-screen/Makefile.am @@ -55,7 +55,7 @@ TAGS_DEPENDENCIES = $(sources) EXTRA_DIST += $(sources) compile.sh x11-screen.pkg EXTRA_DIST += x11-screen-check.sh x11-screen-test.scm -EXTRA_DIST += make.scm optiondb.scm +EXTRA_DIST += make.scm optiondb.scm compile.scm install-data-hook: ( echo '(add-plugin "x11-screen" "@MIT_SCHEME_PROJECT@"'; \ diff --git a/src/x11-screen/configure.ac b/src/x11-screen/configure.ac index 25636bbab..fa9336427 100644 --- a/src/x11-screen/configure.ac +++ b/src/x11-screen/configure.ac @@ -36,9 +36,10 @@ AC_PROG_INSTALL MIT_SCHEME_PROJECT=mit-scheme : ${MIT_SCHEME_EXE=mit-scheme} -MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\ - echo " (system-library-directory-pathname)))" ) \ - | ${MIT_SCHEME_EXE} --batch-mode` +default_libdir=`( echo "(display (->namestring" ;\ + echo " (system-library-directory-pathname)))" ) \ + | ${MIT_SCHEME_EXE} --batch-mode` +: ${MIT_SCHEME_LIBDIR=${default_libdir}} cc_type=`echo "(display microcode-id/compiled-code-type)" \ | ${MIT_SCHEME_EXE} --batch-mode` @@ -69,7 +70,6 @@ ${MIT_SCHEME_PKD}: stamp-scheme" AC_SUBST([MIT_SCHEME_PROJECT]) AC_SUBST([MIT_SCHEME_EXE]) AC_SUBST([MIT_SCHEME_LIBDIR]) -AC_SUBST([MIT_SCHEME_INCLUDEDIR]) AC_SUBST([MIT_SCHEME_PKD]) AC_SUBST([MIT_SCHEME_SCMs]) AC_SUBST([MIT_SCHEME_BCIs]) diff --git a/src/x11/configure.ac b/src/x11/configure.ac index 6260f43ef..8d6792100 100644 --- a/src/x11/configure.ac +++ b/src/x11/configure.ac @@ -99,14 +99,16 @@ fi MIT_SCHEME_PROJECT=mit-scheme : ${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` +default_libdir=`( echo "(display (->namestring" ;\ + echo " (system-library-directory-pathname)))" ) \ + | ${MIT_SCHEME_EXE} --batch-mode` +: ${MIT_SCHEME_LIBDIR=${default_libdir}} +default_includedir=`( echo "(display (->namestring" ;\ + echo " (directory-pathname" ;\ + echo " (system-library-pathname" ;\ + echo ' "mit-scheme.h"))))' ) \ + | ${MIT_SCHEME_EXE} --batch-mode` +: ${MIT_SCHEME_INCLUDEDIR=${default_includedir}} cc_type=`echo "(display microcode-id/compiled-code-type)" \ | ${MIT_SCHEME_EXE} --batch-mode` -- 2.25.1