core: Resurrect loading of boot-0.32-mo.

This commit is contained in:
Jan Nieuwenhuizen 2018-06-18 18:55:59 +02:00
parent 22a22c1de8
commit 8793e0dde3
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
3 changed files with 3 additions and 2 deletions

View file

@ -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)}

View file

@ -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-"

View file

@ -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);