Mercurial > hg > octave-nkf

diff run-octave.in @ 16522:bfff338c56d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
set default terminal font for the GUI from the configure script * configure.ac (DEFAULT_TERMINAL_FONT, DEFAULT_TERMINAL_FONT_SIZE): New variables. Set depending on system type. * common.mk: Substitute them here. (do_subst_qt_settings): New macro. * libgui/default-qt-settings.in: Rename from default-qt-settings. Substitute terminal font and size. * libgui/Makefile.am (EXTRA_DIST): Distribute default-qt-settings.in instead of default-qt-settings. (default-qt-settings): New rule. * run-octave.in (OCTAVE_DEFAULT_QT_SETTINGS): Look in build directory for default-qt-settings file.
author John W. Eaton <jwe@octave.org>
date Tue, 16 Apr 2013 13:10:29 -0400
parents dd583c258cf9
children 0e1fe2aff3e5
line wrap: on
line diff
--- a/run-octave.in
+++ b/run-octave.in
@@ -79,7 +79,7 @@
 fi
 
 OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/main-rcfile" \
-OCTAVE_DEFAULT_QT_SETTINGS="$top_srcdir/libgui/default-qt-settings" \
+OCTAVE_DEFAULT_QT_SETTINGS="$builddir/libgui/default-qt-settings" \
 OCTAVE_LOCALE_DIR="$top_srcdir/libgui/languages" \
 OCTAVE_JAVA_DIR="$builddir/scripts/java" \
   exec $builddir/libtool --mode=execute $driver \