From: Debian Octave Group <team+pkg-octave-team@tracker.debian.org>
Date: Thu, 25 Jul 2019 02:20:25 +0000 (+0100)
Subject: drop_versioned_binaries
X-Git-Tag: archive/raspbian/4.4.1-6+rpi1~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=350aa1653ed06a4ac62051c12d2d16ad884405c8;p=octave.git

drop_versioned_binaries


Gbp-Pq: Name drop_versioned_binaries.diff
---

diff --git a/scripts/miscellaneous/mkoctfile.m b/scripts/miscellaneous/mkoctfile.m
index 13c4ac8f..7e83c77b 100644
--- a/scripts/miscellaneous/mkoctfile.m
+++ b/scripts/miscellaneous/mkoctfile.m
@@ -148,7 +148,7 @@ function [output, status] = mkoctfile (varargin)
   ext = __octave_config_info__ ("EXEEXT");
 
   shell_script = fullfile (bindir,
-                           sprintf ("mkoctfile-%s%s", OCTAVE_VERSION, ext));
+                           "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 21473d5d..c923b871 100644
--- a/scripts/pkg/private/configure_make.m
+++ b/scripts/pkg/private/configure_make.m
@@ -31,13 +31,13 @@ function configure_make (desc, packdir, verbose)
     ver = version ();
     ext = __octave_config_info__ ("EXEEXT");
     mkoctfile_program = fullfile (octave_bindir, ...
-                                  sprintf ("mkoctfile-%s%s", ver, ext));
+                                  "mkoctfile");
     octave_config_program = fullfile (octave_bindir, ...
-                                      sprintf ("octave-config-%s%s", ver, ext));
+                                      "octave-config");
     if (ispc () && ! isunix ())
       octave_binary = fullfile (octave_bindir, sprintf ("octave-%s.bat", ver));
     else
-      octave_binary = fullfile (octave_bindir, sprintf ("octave-%s%s", ver, ext));
+      octave_binary = fullfile (octave_bindir, "octave");
     endif
 
     if (! exist (mkoctfile_program, "file"))
diff --git a/src/main.in.cc b/src/main.in.cc
index f4ba4772..12944a26 100644
--- a/src/main.in.cc
+++ b/src/main.in.cc
@@ -211,7 +211,7 @@ main (int argc, char **argv)
   std::string octave_bindir = get_octave_bindir ();
   std::string octave_archlibdir = get_octave_archlibdir ();
   std::string octave_cli
-    = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;
+    = octave_bindir + dir_sep_char + "octave-cli";
   std::string octave_gui = octave_archlibdir + dir_sep_char + "octave-gui";
 
 #if defined (HAVE_OCTAVE_QT_GUI)
diff --git a/src/module.mk b/src/module.mk
index b14d51f4..ae2816c0 100644
--- a/src/module.mk
+++ b/src/module.mk
@@ -210,7 +210,7 @@ endif
 
 ALL_LOCAL_TARGETS += $(OCTAVE_CROSS_TOOLS)
 
-install-exec-hook: make-version-links
+install-exec-hook:
 
 uninstall-local: remove-version-links