Mercurial > octave
diff build-aux/subst-cross-config-vals.in.sh @ 23759:f891afece80d
also substitute new mkoctfile variables in subst-cross-config-vals script
* subst-cross-config-vals.in.sh: Also substitute
OCTAVE_CONF_MKOCTFILE_OCTAVE_LINK_DEPS and
OCTAVE_CONF_MKOCTFILE_OCT_LINK_DEPS.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 10 Jul 2017 09:38:17 -0400 |
| parents | dcf3f00a7283 |
| children | 6f56efc098bd |
line wrap: on
line diff
--- a/build-aux/subst-cross-config-vals.in.sh Sun Jul 09 19:50:35 2017 -0700 +++ b/build-aux/subst-cross-config-vals.in.sh Mon Jul 10 09:38:17 2017 -0400 @@ -125,6 +125,8 @@ MAGICK_CPPFLAGS="@MAGICK_CPPFLAGS@" MAGICK_LDFLAGS="@MAGICK_LDFLAGS@" MAGICK_LIBS="@MAGICK_LIBS@" +MKOCTFILE_OCTAVE_LINK_DEPS="@MKOCTFILE_OCTAVE_LINK_DEPS@" +MKOCTFILE_OCT_LINK_DEPS="@MKOCTFILE_OCT_LINK_DEPS@" OCTAVE_LINK_DEPS="@OCTAVE_LINK_DEPS@" OCTAVE_LINK_OPTS="@OCTAVE_LINK_OPTS@" OCT_LINK_DEPS="@OCT_LINK_DEPS@" @@ -297,6 +299,8 @@ -e "s|%OCTAVE_CONF_MKOCTFILE_F77%|\"${F77}\"|" \ -e "s|%OCTAVE_CONF_MKOCTFILE_LD_CXX%|\"${LD_CXX}\"|" \ -e "s|%OCTAVE_CONF_MKOCTFILE_RANLIB%|\"${RANLIB}\"|" \ + -e "s|%OCTAVE_CONF_MKOCTFILE_OCTAVE_LINK_DEPS%|\"${MKOCTFILE_OCTAVE_LINK_DEPS}\"|" \ + -e "s|%OCTAVE_CONF_MKOCTFILE_OCT_LINK_DEPS%|\"${MKOCTFILE_OCT_LINK_DEPS}\"|" \ -e "s|%OCTAVE_CONF_OCTAVE_LINK_DEPS%|\"${OCTAVE_LINK_DEPS}\"|" \ -e "s|%OCTAVE_CONF_OCTAVE_LINK_OPTS%|\"${OCTAVE_LINK_OPTS}\"|" \ -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \