Mercurial > octave
changeset 21408:43056b877047
build: Create default-qt-settings file (bug #47342).
* mk-default-qt-settings.in.sh: Eliminate spaces around '=' so that shell
doesn't error out on variable assignment.
* libgui/module.mk: Use comma to pass argument to simple-filter-rule.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sat, 05 Mar 2016 08:04:13 -0800 |
| parents | bce9d52161cf |
| children | 1aa293d58df0 |
| files | build-aux/mk-default-qt-settings.in.sh libgui/module.mk |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/mk-default-qt-settings.in.sh Sat Mar 05 07:15:55 2016 -0800 +++ b/build-aux/mk-default-qt-settings.in.sh Sat Mar 05 08:04:13 2016 -0800 @@ -20,8 +20,8 @@ : ${SED=@SED@} -DEFAULT_TERMINAL_FONT = @DEFAULT_TERMINAL_FONT@ -DEFAULT_TERMINAL_FONT_SIZE = @DEFAULT_TERMINAL_FONT_SIZE@ +DEFAULT_TERMINAL_FONT=@DEFAULT_TERMINAL_FONT@ +DEFAULT_TERMINAL_FONT_SIZE=@DEFAULT_TERMINAL_FONT_SIZE@ $SED \ -e "s|%DEFAULT_TERMINAL_FONT%|${DEFAULT_TERMINAL_FONT}|" \
--- a/libgui/module.mk Sat Mar 05 07:15:55 2016 -0800 +++ b/libgui/module.mk Sat Mar 05 08:04:13 2016 -0800 @@ -71,7 +71,7 @@ octlocale_DATA += $(LOCALES) libgui/default-qt-settings: libgui/default-qt-settings.in build-aux/mk-default-qt-settings.sh | libgui/$(octave_dirstamp) - $(AM_V_GEN)$(call simple-filter-rule build-aux/mk-default-qt-settings.sh) + $(AM_V_GEN)$(call simple-filter-rule,build-aux/mk-default-qt-settings.sh) DIRSTAMP_FILES += \ libgui/$(octave_dirstamp)