diff options
| author | Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> | 2020-04-19 23:57:02 +0300 |
|---|---|---|
| committer | Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> | 2020-04-20 00:01:07 +0300 |
| commit | 06d3deb4ccf5eaaf83dd6f2e5e5173043f1a429f (patch) | |
| tree | bb915d4b184ccac773b7583fa7347e397109f41b | |
| parent | 07ce6b96156d32ce0b49a577f68f83f8daf2b560 (diff) | |
guile: path updates for 2.2
| -rw-r--r-- | guile/Makefile.am | 2 | ||||
| -rw-r--r-- | guile/mu/Makefile.am | 4 | ||||
| -rw-r--r-- | lib/mu-script.c | 2 | ||||
| -rw-r--r-- | mu/mu-cmd-script.c | 6 | ||||
| -rw-r--r-- | mu/mu-config.c | 1 |
5 files changed, 9 insertions, 6 deletions
diff --git a/guile/Makefile.am b/guile/Makefile.am index 08c495c..319b079 100644 --- a/guile/Makefile.am +++ b/guile/Makefile.am @@ -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) diff --git a/guile/mu/Makefile.am b/guile/mu/Makefile.am index f4b8b87..f531822 100644 --- a/guile/mu/Makefile.am +++ b/guile/mu/Makefile.am @@ -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 \ diff --git a/lib/mu-script.c b/lib/mu-script.c index baf2a1f..c5b167f 100644 --- a/lib/mu-script.c +++ b/lib/mu-script.c @@ -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) { diff --git a/mu/mu-cmd-script.c b/mu/mu-cmd-script.c index f43a26d..e1180c1 100644 --- a/mu/mu-cmd-script.c +++ b/mu/mu-cmd-script.c @@ -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); diff --git a/mu/mu-config.c b/mu/mu-config.c index 8d354e0..af98a37 100644 --- a/mu/mu-config.c +++ b/mu/mu-config.c @@ -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); |