From 214fe0c340f64ee0667d3279b829ada851953dc6 Mon Sep 17 00:00:00 2001 From: Debian Octave Group Date: Mon, 1 Dec 2014 20:25:52 +0000 Subject: [PATCH] drop_versioned_binaries Gbp-Pq: Name drop_versioned_binaries.diff --- scripts/miscellaneous/mkoctfile.m | 2 +- scripts/pkg/private/configure_make.m | 6 +++--- src/Makefile.am | 2 +- src/main.in.cc | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/miscellaneous/mkoctfile.m b/scripts/miscellaneous/mkoctfile.m index 4714b789..1aa0421f 100644 --- a/scripts/miscellaneous/mkoctfile.m +++ b/scripts/miscellaneous/mkoctfile.m @@ -148,7 +148,7 @@ function [output, status] = mkoctfile (varargin) bindir = octave_config_info ("bindir"); ext = octave_config_info ("EXEEXT"); - shell_script = fullfile (bindir, sprintf ("mkoctfile-%s%s", OCTAVE_VERSION, ext)); + shell_script = fullfile (bindir, "mkoctfile"); if (! exist (shell_script, "file")) __gripe_missing_component__ ("mkoctfile", "mkoctfile"); diff --git a/scripts/pkg/private/configure_make.m b/scripts/pkg/private/configure_make.m index 73a7a9f4..f438ddec 100644 --- a/scripts/pkg/private/configure_make.m +++ b/scripts/pkg/private/configure_make.m @@ -29,9 +29,9 @@ function configure_make (desc, packdir, verbose) octave_bindir = octave_config_info ("bindir"); ver = version (); ext = octave_config_info ("EXEEXT"); - mkoctfile_program = fullfile (octave_bindir, sprintf ("mkoctfile-%s%s", ver, ext)); - octave_config_program = fullfile (octave_bindir, sprintf ("octave-config-%s%s", ver, ext)); - octave_binary = fullfile (octave_bindir, sprintf ("octave-%s%s", ver, ext)); + mkoctfile_program = fullfile (octave_bindir, "mkoctfile"); + octave_config_program = fullfile (octave_bindir, "octave-config"); + octave_binary = fullfile (octave_bindir, "octave"); cenv = {"MKOCTFILE"; mkoctfile_program; "OCTAVE_CONFIG"; octave_config_program; "OCTAVE"; octave_binary; diff --git a/src/Makefile.am b/src/Makefile.am index 1aaaf029..7366e0a7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -141,7 +141,7 @@ mkoctfile.cc: mkoctfile.in.cc Makefile main.cc: main.in.cc Makefile @$(do_subst_default_vals) -install-exec-hook: make-version-links +install-exec-hook: uninstall-local: remove-version-links diff --git a/src/main.in.cc b/src/main.in.cc index 695c6539..0f1774ce 100644 --- a/src/main.in.cc +++ b/src/main.in.cc @@ -500,7 +500,7 @@ main (int argc, char **argv) std::string octave_archlibdir = get_octave_archlibdir (); std::string file - = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;; + = octave_bindir + dir_sep_char + "octave-cli";; char **new_argv = new char * [argc + 1]; @@ -521,7 +521,7 @@ main (int argc, char **argv) file = octave_archlibdir + dir_sep_char + "octave-gui"; #else - file = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION; + file = octave_bindir + dir_sep_char + "octave-cli"; #endif new_argv[k++] = argv[i]; } @@ -566,7 +566,7 @@ main (int argc, char **argv) start_gui = false; gui_libs = false; - file = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION; + file = octave_bindir + dir_sep_char + "octave-cli"; if (warn_display) { -- 2.30.2