Mercurial > octave-nkf

changeset 18169:002c06b3fc51 gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of stable to gui-release.
author John W. Eaton <jwe@octave.org>
date Tue, 24 Dec 2013 01:41:22 -0500
parents eb51f47d9dee (current diff) 525af54479eb (diff)
children 8d332da6694f 85d45717b28d c26f44818eed
files
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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" \