emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

guile: path updates for 2.2

This commit is contained in:
Dirk-Jan C. Binnema 2020-04-19 23:57:02 +03:00
parent 07ce6b9615
commit 06d3deb4cc
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guile/Makefile.am
View File

@ -68,7 +68,7 @@ SUFFIXES = .x .doc
# FIXME: GUILE_SITEDIR would be better, but that
# breaks 'make distcheck'
scmdir=${prefix}/share/guile/site/2.0/
scmdir=${prefix}/share/guile/site/2.2/
scm_DATA=mu.scm
EXTRA_DIST=$(scm_DATA)

4
guile/mu/Makefile.am
View File

@ -1,4 +1,4 @@
## Copyright (C) 2008-2013 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
## Copyright (C) 2008-2020 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@ -18,7 +18,7 @@ include $(top_srcdir)/gtest.mk
# FIXME: GUILE_SITEDIR would be better, but that
# breaks 'make distcheck'
scmdir=${prefix}/share/guile/site/2.0/mu/
scmdir=${prefix}/share/guile/site/2.2/mu/
scm_DATA= \
stats.scm \

2
lib/mu-script.c
View File

@ -318,7 +318,7 @@ mu_script_guile_run (MuScriptInfo *msi, const char *muhome,
g_return_val_if_fail (muhome, FALSE);
argv = g_new0 (char*, 6);
argv[0] = g_strdup("guile");
argv[0] = g_strdup("guile2.2");
argv[1] = g_strdup("-l");
if (access (mu_script_info_path (msi), R_OK) != 0) {

6
mu/mu-cmd-script.c
View File

@ -31,10 +31,13 @@
#include "mu-cmd.h"
#include "mu-script.h"
#include "mu-runtime.h"
#include "utils/mu-util.h"
#include "utils/mu-str.h"
#define MU_GUILE_EXT ".scm"
#define MU_GUILE_DESCR_PREFIX ";; INFO: "
@ -192,7 +195,8 @@ mu_cmd_script (MuConfig *opts, GError **err)
}
/* do it! */
mu_script_guile_run (msi, opts->muhome, opts->script_params, err);
mu_script_guile_run (msi, mu_runtime_path(MU_RUNTIME_PATH_CACHE),
opts->script_params, err);
leave:
/* this won't be reached, unless there is some error */
mu_script_info_list_destroy (scripts);

1
mu/mu-config.c
View File

@ -83,7 +83,6 @@ set_group_mu_defaults (void)
{
/* If muhome is not set, we use the XDG Base Directory Specification
* locations. */
if (MU_CONFIG.muhome)
expand_dir(MU_CONFIG.muhome);