Mercurial > octave
changeset 24938:4f1da669b610 stable
build: export and use qcollectiongenerator command line options correctly
* acinclude.m4 (OCTAVE_CHECK_QT_VERSION): Export QCOLLECTIONGENERATORFLAGS
and QHELPGENERATORFLAGS.
* doc/interpreter/module.mk ($(OCTAVE_QTHELP_FILES)): Add command line options
from $(QCOLLECTIONGENERATORFLAGS).
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Mon, 19 Mar 2018 20:20:25 -0700 |
| parents | a0297217d3d3 |
| children | 5f4550b5d31b |
| files | doc/interpreter/module.mk m4/acinclude.m4 |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/module.mk Mon Mar 19 19:12:43 2018 -0700 +++ b/doc/interpreter/module.mk Mon Mar 19 20:20:25 2018 -0700 @@ -205,7 +205,7 @@ $(OCTAVE_QTHELP_FILES): $(OCTAVE_HTML_STAMP) $(srcdir)/%reldir%/prepare_qhelp.py $(AM_V_GEN)rm -f $(OCTAVE_QTHELP_FILES) && \ $(PYTHON) $(srcdir)/%reldir%/prepare_qhelp.py %reldir%/octave_interpreter octave.html && \ - $(QCOLLECTIONGENERATOR) %reldir%/octave_interpreter.qhcp -o %reldir%/octave_interpreter.qhc >/dev/null && \ + $(QCOLLECTIONGENERATOR) $(QCOLLECTIONGENERATORFLAGS) %reldir%/octave_interpreter.qhcp -o %reldir%/octave_interpreter.qhc >/dev/null && \ rm -f %reldir%/octave_interpreter.qhcp %reldir%/octave_interpreter.qhp ## The Qt help collection generator command produces two output files
--- a/m4/acinclude.m4 Mon Mar 19 19:12:43 2018 -0700 +++ b/m4/acinclude.m4 Mon Mar 19 20:20:25 2018 -0700 @@ -1955,8 +1955,8 @@ UICFLAGS= RCCFLAGS= LRELEASEFLAGS= + QCOLLECTIONGENERATORFLAGS= QHELPGENERATORFLAGS= - QCOLLECTIONGENERATORFLAGS= $as_unset ac_cv_prog_MOC_QTVER $as_unset ac_cv_prog_ac_ct_MOC_QTVER $as_unset ac_cv_prog_UIC_QTVER @@ -1965,6 +1965,8 @@ $as_unset ac_cv_prog_ac_ct_RCC_QTVER $as_unset ac_cv_prog_LRELEASE_QTVER $as_unset ac_cv_prog_ac_ct_LRELEASE_QTVER + $as_unset ac_cv_prog_QCOLLECTIONGENERATOR_QTVER + $as_unset ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR_QTVER $as_unset ac_cv_prog_QHELPGENERATOR_QTVER $as_unset ac_cv_prog_ac_ct_QHELPGENERATOR_QTVER fi @@ -2057,6 +2059,8 @@ AC_SUBST(UICFLAGS) AC_SUBST(RCCFLAGS) AC_SUBST(LRELEASEFLAGS) + AC_SUBST(QCOLLECTIONGENERATORFLAGS) + AC_SUBST(QHELPGENERATORFLAGS) AC_SUBST(QT_CPPFLAGS) AC_SUBST(QT_LDFLAGS) AC_SUBST(QT_LIBS)