# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1387867282 18000
# Node ID 002c06b3fc51e41d8805b81682639643245125e1
# Parent  eb51f47d9dee73378799ef385b57dc0b8fa7707a# Parent  525af54479ebf126e5a7561874ebde910d813c4e
maint: Periodic merge of stable to gui-release.

diff -r eb51f47d9dee -r 002c06b3fc51 run-octave.in
--- a/run-octave.in	Mon Dec 23 19:39:39 2013 -0500
+++ b/run-octave.in	Tue Dec 24 01:41:22 2013 -0500
@@ -78,7 +78,13 @@
   fi
 fi
 
+## We set OCTAVE_ARCHLIBDIR so that the wrapper program can find the
+## octave-gui program in the build tree.  That will fail if we ever
+## need Octave to find other things in ARCHLIBDIR that are not built
+## in the $builddir/src directory.
+
 OCTAVE_BINDIR="$builddir/src" \
+OCTAVE_ARCHLIBDIR="$builddir/src" \
 OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/main-rcfile" \
 OCTAVE_DEFAULT_QT_SETTINGS="$builddir/libgui/default-qt-settings" \
 OCTAVE_LOCALE_DIR="$builddir/libgui/languages" \