Mercurial > octave-antonio

diff libgui/Makefile.am @ 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 c34f8bb1ebec
children 02a90cb9d79f
line wrap: on
line diff
--- a/libgui/Makefile.am	Tue Apr 16 01:49:20 2013 -0400
+++ b/libgui/Makefile.am	Tue Apr 16 13:10:29 2013 -0400
@@ -38,7 +38,7 @@
 
 LOCALES = $(patsubst languages/%.ts, languages/%.qm, $(TRANSLATIONS))
 
-EXTRA_DIST = default-qt-settings $(TRANSLATIONS)
+EXTRA_DIST = default-qt-settings.in $(TRANSLATIONS)
 CLEANFILES =
 
 BUILT_SOURCES =
@@ -83,6 +83,9 @@
 
 octlocale_DATA = $(LOCALES)
 
+default-qt-settings: default-qt-settings.in
+	$(do_subst_qt_settings)
+
 moc-%.cc: %.h
 	$(MOC) -o$@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MOC_CPPFLAGS) $(liboctgui_la_CPPFLAGS) $<