# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1455722468 18000
# Node ID 2c93596507feb9837cad44ed4efbcb0f11994439
# Parent  d3b265a83adcbde29b87f8fe70c5e2ac5e18ab45# Parent  1bbd799ac7c7ed4c6b0d1daac8e5059df852d929
maint: Merge stable to default.

diff -r d3b265a83adc -r 2c93596507fe src/main.in.cc
--- a/src/main.in.cc	Wed Feb 17 10:16:36 2016 -0500
+++ b/src/main.in.cc	Wed Feb 17 10:21:08 2016 -0500
@@ -432,16 +432,18 @@
 
   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;
+  std::string octave_gui = octave_archlibdir + dir_sep_char + "octave-gui";
 
 #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 filename.
 
-  std::string file = octave_archlibdir + dir_sep_char + "octave-gui";
+  std::string file = octave_gui;
 #else
-  std::string file
-    = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;
+  std::string file = octave_cli;
 #endif
 
   char **new_argv = new char * [argc + 1];
@@ -462,7 +464,7 @@
 
           start_gui = false;
           gui_libs = false;
-          file = octave_bindir + dir_sep_char + "octave-cli";
+          file = octave_cli;
         }
       else if (! strcmp (argv[i], "--no-gui"))
         {
@@ -498,7 +500,7 @@
           start_gui = false;
           gui_libs = false;
 
-          file = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;
+          file = octave_cli;
 
           if (warn_display)
             {