core: Resurrect loading of boot-0.32-mo.
authorJan Nieuwenhuizen <janneke@gnu.org>
Mon, 18 Jun 2018 16:55:59 +0000 (18:55 +0200)
committerJan Nieuwenhuizen <janneke@gnu.org>
Mon, 18 Jun 2018 16:55:59 +0000 (18:55 +0200)
build-aux/build-mes-gcc.sh
build.sh
src/mes.c

index 58c24cb759410c09e50cad3918d1955933eeb605..37d411ba595bc909aba8dbfa70c922203abd1f57 100755 (executable)
@@ -24,6 +24,7 @@ if [ -n "$BUILD_DEBUG" ]; then
     set -x
 fi
 
+MODULEDIR=${MODULEDIR-${DATADIR}${DATADIR:+/}module}
 export CC32 CPPFLAGS C32FLAGS
 
 CC32=${CC32-$(command -v i686-unknown-linux-gnu-gcc)}
index bc399e7c0bcb22acef7a68c5a382c6c44a0ccfb1..0c78e7f35686557f5bc14ab8441a09d7b7a0695f 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -39,7 +39,7 @@ MES_DEBUG=${MES_DEBUG-1}
 
 PREFIX=${PREFIX-/usr/local}
 DATADIR=${DATADIR-$PREFIX/share/mes}
-MODULEDIR=${MODULEDIR-$DATADIR/module}
+MODULEDIR=${MODULEDIR-${DATADIR}${DATADIR:+/}module}
 set -e
 
 CPPFLAGS=${CPPFLAGS-"
index d98c613b5214347682a13318cd68d68b064bf77f..710c308295066422506786265bd6ccd02fa0c6ce 100644 (file)
--- a/src/mes.c
+++ b/src/mes.c
@@ -2286,7 +2286,7 @@ SCM
 bload_env (SCM a) ///((internal))
 {
 #if !_POSIX_SOURCE
-  char *mo = "mes/read-0-32.mo";
+  char *mo = "mes/boot-0.32-mo";
   g_stdin = open ("module/mes/boot-0.32-mo", O_RDONLY);
   char *read0 = MODULEDIR "/mes/boot-0.32-mo";
   g_stdin = g_stdin >= 0 ? g_stdin : open (read0, O_RDONLY);