build: Resolve MODULEDIR confusion. Fixes mes installation.
* make/install.make (GUILEDIR): New variable. Was MODULEDIR. (MODULEDIR): Mes' module dir. * guile/mescc.scm: Update. * src/mes.c (load_env, bload_env): Update.
This commit is contained in:
parent
bd63224711
commit
e16a74d74f
|
@ -1,11 +1,11 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# -*-scheme-*-
|
# -*-scheme-*-
|
||||||
GODIR=${GODIR-@GODIR@}
|
GODIR=${GODIR-@GODIR@}
|
||||||
MODULEDIR=${MODULEDIR-@MODULEDIR@}
|
GUILEDIR=${GUILEDIR-@GUILEDIR@}
|
||||||
[ "$GODIR" = @"GODIR"@ ] && GODIR=guile
|
[ "$GODIR" = @"GODIR"@ ] && GODIR=guile
|
||||||
[ "$MODULEDIR" = @"MODULEDIR"@ ] && MODULEDIR=guile
|
[ "$GUILEDIR" = @"GUILEDIR"@ ] && GUILEDIR=guile
|
||||||
export GUILE_AUTO_COMPILE=${GUILE_AUTO_COMPILE-0}
|
export GUILE_AUTO_COMPILE=${GUILE_AUTO_COMPILE-0}
|
||||||
exec ${GUILE-guile} -L $MODULEDIR -C $GODIR -e '(mescc)' -s "$0" "$@"
|
exec ${GUILE-guile} -L $GUILEDIR -C $GODIR -e '(mescc)' -s "$0" "$@"
|
||||||
!#
|
!#
|
||||||
|
|
||||||
;;; Mes --- The Maxwell Equations of Software
|
;;; Mes --- The Maxwell Equations of Software
|
||||||
|
|
|
@ -31,8 +31,10 @@ DATADIR:=$(PREFIX)/share
|
||||||
DOCDIR:=$(DATADIR)/doc
|
DOCDIR:=$(DATADIR)/doc
|
||||||
endif
|
endif
|
||||||
LIBDIR:=$(PREFIX)/lib
|
LIBDIR:=$(PREFIX)/lib
|
||||||
MODULEDIR:=$(PREFIX)/share/guile/site/$(GUILE_EFFECTIVE_VERSION)
|
|
||||||
GODIR:=$(LIBDIR)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache
|
GODIR:=$(LIBDIR)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache
|
||||||
|
GUILEDIR:=$(PREFIX)/share/guile/site/$(GUILE_EFFECTIVE_VERSION)
|
||||||
|
MODULEDIR:=$(DATADIR)/module
|
||||||
|
|
||||||
.tarball-version: tree-clean-p
|
.tarball-version: tree-clean-p
|
||||||
echo $(COMMIT) > $@
|
echo $(COMMIT) > $@
|
||||||
|
@ -74,6 +76,7 @@ install: $(CLEAN) ChangeLog
|
||||||
-e 's,@DATADIR@,$(DATADIR)/,g' \
|
-e 's,@DATADIR@,$(DATADIR)/,g' \
|
||||||
-e 's,@DOCDIR@,$(DOCDIR)/,g' \
|
-e 's,@DOCDIR@,$(DOCDIR)/,g' \
|
||||||
-e 's,@GODIR@,$(GODIR)/,g' \
|
-e 's,@GODIR@,$(GODIR)/,g' \
|
||||||
|
-e 's,@GUILEDIR@,$(GUILEDIR)/,g' \
|
||||||
-e 's,@MODULEDIR@,$(MODULEDIR)/,g' \
|
-e 's,@MODULEDIR@,$(MODULEDIR)/,g' \
|
||||||
-e 's,@PREFIX@,$(PREFIX)/,g' \
|
-e 's,@PREFIX@,$(PREFIX)/,g' \
|
||||||
-e 's,@VERSION@,$(VERSION),g' \
|
-e 's,@VERSION@,$(VERSION),g' \
|
||||||
|
@ -90,9 +93,9 @@ install: $(CLEAN) ChangeLog
|
||||||
$(GIT_ARCHIVE_HEAD) doc \
|
$(GIT_ARCHIVE_HEAD) doc \
|
||||||
| tar -C $(DESTDIR)$(DOCDIR) --strip=1 -xf-
|
| tar -C $(DESTDIR)$(DOCDIR) --strip=1 -xf-
|
||||||
cp ChangeLog $(DESTDIR)$(DOCDIR)
|
cp ChangeLog $(DESTDIR)$(DOCDIR)
|
||||||
mkdir -p $(DESTDIR)$(MODULEDIR)
|
mkdir -p $(DESTDIR)$(GUILEDIR)
|
||||||
tar -cf- -C module $(INSTALL_SCM_FILES:module/%=%)\
|
tar -cf- -C module $(INSTALL_SCM_FILES:module/%=%)\
|
||||||
| tar -C $(DESTDIR)$(MODULEDIR) -xf-
|
| tar -C $(DESTDIR)$(GUILEDIR) -xf-
|
||||||
mkdir -p $(DESTDIR)$(GODIR)
|
mkdir -p $(DESTDIR)$(GODIR)
|
||||||
tar -cf- -C module $(INSTALL_GO_FILES:module/%=%)\
|
tar -cf- -C module $(INSTALL_GO_FILES:module/%=%)\
|
||||||
| tar -C $(DESTDIR)$(GODIR) -xf-
|
| tar -C $(DESTDIR)$(GODIR) -xf-
|
||||||
|
|
|
@ -1248,7 +1248,7 @@ load_env (SCM a) ///((internal))
|
||||||
{
|
{
|
||||||
r0 = a;
|
r0 = a;
|
||||||
g_stdin = open ("module/mes/read-0.mes", O_RDONLY);
|
g_stdin = open ("module/mes/read-0.mes", O_RDONLY);
|
||||||
g_stdin = g_stdin >= 0 ? g_stdin : open (MODULEDIR "mes/read-0.mes", O_RDONLY);
|
g_stdin = g_stdin >= 0 ? g_stdin : open (MODULEDIR "/mes/read-0.mes", O_RDONLY);
|
||||||
if (!g_function) r0 = mes_builtins (r0);
|
if (!g_function) r0 = mes_builtins (r0);
|
||||||
r2 = read_input_file_env (r0);
|
r2 = read_input_file_env (r0);
|
||||||
g_stdin = STDIN;
|
g_stdin = STDIN;
|
||||||
|
@ -1261,11 +1261,11 @@ bload_env (SCM a) ///((internal))
|
||||||
#if __MESC__
|
#if __MESC__
|
||||||
char *mo = "mes/read-0-32.mo";
|
char *mo = "mes/read-0-32.mo";
|
||||||
g_stdin = open ("module/mes/read-0-32.mo", O_RDONLY);
|
g_stdin = open ("module/mes/read-0-32.mo", O_RDONLY);
|
||||||
g_stdin = g_stdin >= 0 ? g_stdin : open (MODULEDIR "mes/read-0-32.mo", O_RDONLY);
|
g_stdin = g_stdin >= 0 ? g_stdin : open (MODULEDIR "/mes/read-0-32.mo", O_RDONLY);
|
||||||
#else
|
#else
|
||||||
char *mo ="mes/read-0.mo";
|
char *mo ="mes/read-0.mo";
|
||||||
g_stdin = open ("module/mes/read-0.mo", O_RDONLY);
|
g_stdin = open ("module/mes/read-0.mo", O_RDONLY);
|
||||||
g_stdin = g_stdin >= 0 ? g_stdin : open (MODULEDIR "mes/read-0.mo", O_RDONLY);
|
g_stdin = g_stdin >= 0 ? g_stdin : open (MODULEDIR "/mes/read-0.mo", O_RDONLY);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (g_stdin < 0) {eputs ("no such file: ");eputs (mo);eputs ("\n");return 1;}
|
if (g_stdin < 0) {eputs ("no such file: ");eputs (mo);eputs ("\n");return 1;}
|
||||||
|
|
Loading…
Reference in New Issue