From 8793e0dde31a98cdd75ffcb8a7c9ac3143bec817 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 18 Jun 2018 18:55:59 +0200
Subject: [PATCH] core: Resurrect loading of boot-0.32-mo.

---
 build-aux/build-mes-gcc.sh | 1 +
 build.sh                   | 2 +-
 src/mes.c                  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build-aux/build-mes-gcc.sh b/build-aux/build-mes-gcc.sh
index 58c24cb7..37d411ba 100755
--- a/build-aux/build-mes-gcc.sh
+++ b/build-aux/build-mes-gcc.sh
@@ -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)}
diff --git a/build.sh b/build.sh
index bc399e7c..0c78e7f3 100755
--- 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-"
diff --git a/src/mes.c b/src/mes.c
index d98c613b..710c3082 100644
--- 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);