Mercurial > octave-nkf
diff build-aux/common.mk @ 16522:bfff338c56d1
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 | 39096b290a2f |
children | e5c0acc31640 |
line wrap: on
line diff
--- a/build-aux/common.mk Tue Apr 16 01:49:20 2013 -0400 +++ b/build-aux/common.mk Tue Apr 16 13:10:29 2013 -0400 @@ -67,6 +67,9 @@ DEFAULT_PAGER = @DEFAULT_PAGER@ +DEFAULT_TERMINAL_FONT = @DEFAULT_TERMINAL_FONT@ +DEFAULT_TERMINAL_FONT_SIZE = @DEFAULT_TERMINAL_FONT_SIZE@ + ENABLE_DYNAMIC_LINKING = @ENABLE_DYNAMIC_LINKING@ SHLEXT = @SHLEXT@ @@ -702,6 +705,14 @@ $(simple_move_if_change_rule) endef +define do_subst_qt_settings +echo "making $@ from $<" +$(SED) < $< \ + -e "s|%DEFAULT_TERMINAL_FONT%|${DEFAULT_TERMINAL_FONT}|" \ + -e "s|%DEFAULT_TERMINAL_FONT_SIZE%|${DEFAULT_TERMINAL_FONT_SIZE}|" > $@-t +$(simple_move_if_change_rule) +endef + define test-file-commands ( echo "## DO NOT EDIT! Generated automatically from $(<F) by Make."; $(GREP) '^%!' $< ) > $@-t mv $@-t $@