[beast: 7/9] SHELL: install unversioned bsescm
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast: 7/9] SHELL: install unversioned bsescm
- Date: Mon, 2 Nov 2015 20:05:34 +0000 (UTC)
commit 5fef643c5ebea91f2638bd58c7f52ce0e9776cb3
Author: Tim Janik <timj gnu org>
Date: Wed Oct 28 13:37:46 2015 +0100
SHELL: install unversioned bsescm
Signed-off-by: Tim Janik <timj gnu org>
bse/bsescripthelper.cc | 4 ++--
shell/Makefile.am | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/bse/bsescripthelper.cc b/bse/bsescripthelper.cc
index ee34c68..9dae243 100644
--- a/bse/bsescripthelper.cc
+++ b/bse/bsescripthelper.cc
@@ -142,7 +142,7 @@ bse_script_procedure_exec (BseProcedureClass *proc,
"(apply %s (bse-script-fetch-args))",
sdata->script_file,
sdata->name));
- shellpath = g_strdup_format ("%s/%s-%u", bse_main_args->path_binaries, "bsescm", BSE_MAJOR_VERSION);
+ shellpath = g_strdup_format ("%s/%s", bse_main_args->path_binaries, "bsescm");
error = bse_server_run_remote (server, shellpath,
params, sdata->script_file, BSE_PROCEDURE_NAME (proc), &janitor);
g_free (shellpath);
@@ -254,7 +254,7 @@ bse_script_file_register (const gchar *file_name,
params = sfi_ring_append (params, g_strdup ("--bse-enable-register"));
params = sfi_ring_append (params, g_strdup ("--bse-eval"));
params = sfi_ring_append (params, g_strdup_format ("(load \"%s\")", file_name));
- char *shellpath = g_strdup_format ("%s/%s-%u", bse_main_args->path_binaries, "bsescm", BSE_MAJOR_VERSION);
+ char *shellpath = g_strdup_format ("%s/%s", bse_main_args->path_binaries, "bsescm");
*janitor_p = NULL;
error = bse_server_run_remote (server, shellpath,
params, file_name, proc_name, janitor_p);
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 008d5ab..7aba707 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -21,9 +21,9 @@ programs_ldadd = $(top_builddir)/bse/libbse- MAJOR@.la $(RAPICORN_LIBS)
#
# programs to build
#
-bin_PROGRAMS = bsescm- MAJOR@ # this expands to bsescm-0
-bsescm_ MAJOR@_SOURCES = bsescm.cc bsescminterp.cc
-bsescm_ MAJOR@_LDADD = $(programs_ldadd) $(BSESCM_LIBS)
+bin_PROGRAMS = bsescm
+bsescm_SOURCES = bsescm.cc bsescminterp.cc
+bsescm_LDADD = $(programs_ldadd) $(BSESCM_LIBS)
# source setups
bsescminterp.cc: # bsescm-genglue.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]