Mercurial > octave-nkf

comparison build-aux/common.mk @ 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 39096b290a2f
children e5c0acc31640
comparison
equal deleted inserted replaced
16521:dbc7018be4be 16522:bfff338c56d1
64 TEXI2PDF = @TEXI2PDF@ 64 TEXI2PDF = @TEXI2PDF@
65 65
66 GHOSTSCRIPT = @GHOSTSCRIPT@ 66 GHOSTSCRIPT = @GHOSTSCRIPT@
67 67
68 DEFAULT_PAGER = @DEFAULT_PAGER@ 68 DEFAULT_PAGER = @DEFAULT_PAGER@
69
70 DEFAULT_TERMINAL_FONT = @DEFAULT_TERMINAL_FONT@
71 DEFAULT_TERMINAL_FONT_SIZE = @DEFAULT_TERMINAL_FONT_SIZE@
69 72
70 ENABLE_DYNAMIC_LINKING = @ENABLE_DYNAMIC_LINKING@ 73 ENABLE_DYNAMIC_LINKING = @ENABLE_DYNAMIC_LINKING@
71 74
72 SHLEXT = @SHLEXT@ 75 SHLEXT = @SHLEXT@
73 SHLEXT_VER = @SHLEXT_VER@ 76 SHLEXT_VER = @SHLEXT_VER@
700 -e "s|%abs_top_srcdir%|${abs_top_srcdir}|" \ 703 -e "s|%abs_top_srcdir%|${abs_top_srcdir}|" \
701 -e "s|%builddir%|$(shell pwd)|" > $@-t 704 -e "s|%builddir%|$(shell pwd)|" > $@-t
702 $(simple_move_if_change_rule) 705 $(simple_move_if_change_rule)
703 endef 706 endef
704 707
708 define do_subst_qt_settings
709 echo "making $@ from $<"
710 $(SED) < $< \
711 -e "s|%DEFAULT_TERMINAL_FONT%|${DEFAULT_TERMINAL_FONT}|" \
712 -e "s|%DEFAULT_TERMINAL_FONT_SIZE%|${DEFAULT_TERMINAL_FONT_SIZE}|" > $@-t
713 $(simple_move_if_change_rule)
714 endef
715
705 define test-file-commands 716 define test-file-commands
706 ( echo "## DO NOT EDIT! Generated automatically from $(<F) by Make."; $(GREP) '^%!' $< ) > $@-t 717 ( echo "## DO NOT EDIT! Generated automatically from $(<F) by Make."; $(GREP) '^%!' $< ) > $@-t
707 mv $@-t $@ 718 mv $@-t $@
708 endef 719 endef
709 720