Mercurial > octave-nkf

changeset 18162:65e4e0569ed4 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
install octave-gui binary in libexec directory * src/Makefile.am (archlib_PROGRAMS): New variable. List octave-gui * here, not in OCTAVE_BINARIES (and, ultimately, bin_PROGRAMS). * src/main.in.cc (OCTAVE_ARCHLIBDIR): New macro. (get_octave_archlibdir): New function. (main): New variable octave_archlibdir. If HAVE_OCTAVE_GUI, set file to octave-gui in the octave_archlibdir directory.
author John W. Eaton <jwe@octave.org>
date Mon, 23 Dec 2013 19:34:34 -0500
parents bce3a82a4a8d
children eb51f47d9dee 525af54479eb
files src/Makefile.am src/main.in.cc
diffstat 2 files changed, 29 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile.am	Sun Dec 22 15:55:02 2013 -0500
+++ b/src/Makefile.am	Mon Dec 23 19:34:34 2013 -0500
@@ -52,7 +52,7 @@
 OCTAVE_VERSION_LINKS = octave-cli-$(version)$(EXEEXT)
 
 if AMCOND_BUILD_GUI
-  OCTAVE_BINARIES += octave-gui
+  archlib_PROGRAMS = octave-gui
   OCTAVE_VERSION_LINKS += octave-gui-$(version)$(EXEEXT)
 endif
 
--- a/src/main.in.cc	Sun Dec 22 15:55:02 2013 -0500
+++ b/src/main.in.cc	Mon Dec 23 19:34:34 2013 -0500
@@ -46,6 +46,10 @@
 #define OCTAVE_VERSION %OCTAVE_VERSION%
 #endif
 
+#ifndef OCTAVE_ARCHLIBDIR
+#define OCTAVE_ARCHLIBDIR %OCTAVE_ARCHLIBDIR%
+#endif
+
 #ifndef OCTAVE_BINDIR
 #define OCTAVE_BINDIR %OCTAVE_BINDIR%
 #endif
@@ -439,6 +443,20 @@
   return obd.empty () ? subst_octave_home (std::string (OCTAVE_BINDIR)) : obd;
 }
 
+static std::string
+get_octave_archlibdir (void)
+{
+  // Accept value from the environment literally, but substitute
+  // OCTAVE_HOME in the configuration value OCTAVE_ARCHLIBDIR in case
+  // Octave has been relocated to some installation directory other than
+  // the one originally configured.
+
+  std::string dir = octave_getenv ("OCTAVE_ARCHLIBDIR");
+
+  return dir.empty ()
+    ? subst_octave_home (std::string (OCTAVE_ARCHLIBDIR)) : dir;
+}
+
 // Adapted from libtool wrapper.
 #if defined (__WIN32__) && ! defined (__CYGWIN__)
 
@@ -593,6 +611,7 @@
   bool gui_libs = false;
 
   std::string octave_bindir = get_octave_bindir ();
+  std::string octave_archlibdir = get_octave_archlibdir ();
 
   std::string file
     = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;;
@@ -609,12 +628,15 @@
         {
           start_gui = true;
           gui_libs = true;
-          file = octave_bindir + dir_sep_char;
-          #if defined (HAVE_OCTAVE_GUI)
-            file += "octave-gui-" OCTAVE_VERSION;
-          #else
-            file += "octave-cli-" OCTAVE_VERSION;
-          #endif
+#if defined (HAVE_OCTAVE_GUI)
+          // The Octave version number is already embedded in the
+          // octave_archlibdir directory name so we don't need to
+          // append it to the octave-gui file name.
+
+          file = octave_archlibdir + dir_sep_char + "octave-gui";
+#else
+          file = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;
+#endif
           new_argv[k++] = argv[i];
         }
       else if (! strcmp (argv[i], "--no-gui-libs"))