drop_versioned_binaries

Gbp-Pq: Name drop_versioned_binaries.diff

diff --git a/scripts/miscellaneous/mkoctfile.m b/scripts/miscellaneous/mkoctfile.m
index 4714b789be3adb23c340e6afd596aea9d7646e0e..1aa0421f79fc778eac9f69a8d72edfb570dd1b7f 100644 (file)
--- 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 73a7a9f4ab9e3368e15ddf71074646eb27ee18d6..f438ddec77efdb812e23559c40f54b5d168b4dcd 100644 (file)
--- 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 1aaaf029662bf58393da594218a0c57ddd08a8b0..7366e0a76b59587de346e9598ab2ea6e6624f888 100644 (file)
--- 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 695c65397f03a150a6cba5c6e9a9965f7f4f6910..0f1774ceb2df53e2f0e510b97af765c015bd8c50 100644 (file)
--- 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)
             {