Mercurial > octave
changeset 25556:cbef9fc53fef
include all octave-config vars in mkoctfile (bug #54260)
* mkoctfile.in.cc: Include all variables from octave-config.in.cc that
were not already available in mkoctfile.in.cc. Update docstring.
* subst-config-vals.in.sh, subst-cross-config-vals.in.sh:
Also substitute all variables that were in subst-default-vals.in.sh
but not in these scripts. Fix minor inconsistencies between the two
scripts.
* src/module.mk, libinterp/corefcn/module.mk: Use subst-config-vals.sh
instead of subst-default-vals.sh.
* subst-default-vals.in.sh: Delete.
* build-aux/module.mk, .hgignore: Update.
* configure.ac (OCTAVE_CONFIG_MOVE_IF_CHANGE_FILES):
Remove build-aux/subst-default-vals.sh from the list.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 06 Jul 2018 19:20:40 -0400 |
| parents | 364a31cd4c4f |
| children | bb779fc2d0db |
| files | .hgignore build-aux/module.mk build-aux/subst-config-vals.in.sh build-aux/subst-cross-config-vals.in.sh build-aux/subst-default-vals.in.sh configure.ac libinterp/corefcn/module.mk src/mkoctfile.in.cc src/module.mk |
| diffstat | 9 files changed, 317 insertions(+), 187 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Fri Jul 06 14:44:48 2018 -0700 +++ b/.hgignore Fri Jul 06 19:20:40 2018 -0400 @@ -43,7 +43,6 @@ ^build-aux/move-if-change$ (^|/)build-aux/subst-config-vals\.sh$ (^|/)build-aux/subst-cross-config-vals\.sh$ -(^|/)build-aux/subst-default-vals\.sh$ (^|/)build-aux/subst-script-vals\.sh$ ^build-aux/texinfo\.tex$ ^build-aux/ylwrap$
--- a/build-aux/module.mk Fri Jul 06 14:44:48 2018 -0700 +++ b/build-aux/module.mk Fri Jul 06 19:20:40 2018 -0400 @@ -13,14 +13,12 @@ %reldir%/stl_algo.h-fixed \ %reldir%/subst-config-vals.in.sh \ %reldir%/subst-cross-config-vals.in.sh \ - %reldir%/subst-default-vals.in.sh \ %reldir%/subst-script-vals.in.sh \ %reldir%/update-bug-status.sh GEN_CONFIG_SHELL += \ %reldir%/subst-config-vals.sh \ %reldir%/subst-cross-config-vals.sh \ - %reldir%/subst-default-vals.sh \ %reldir%/subst-script-vals.sh $(GEN_CONFIG_SHELL) : %.sh : %.in.sh config.status
--- a/build-aux/subst-config-vals.in.sh Fri Jul 06 14:44:48 2018 -0700 +++ b/build-aux/subst-config-vals.in.sh Fri Jul 06 19:20:40 2018 -0400 @@ -20,15 +20,55 @@ : ${SED=@SED@} +canonical_host_type="@canonical_host_type@" +DEFAULT_PAGER="@DEFAULT_PAGER@" +EXEEXT="@EXEEXT@" +man1ext="@man1ext@" +api_version="@OCTAVE_API_VERSION@" +OCTAVE_RELEASE="" +version="@PACKAGE_VERSION@" + prefix="@prefix@" exec_prefix="@exec_prefix@" +archlibdir=`echo "@archlibdir@" | sed "s|^${exec_prefix}/||"` bindir=`echo "@bindir@" | sed "s|^${exec_prefix}/||"` libdir=`echo "@libdir@" | sed "s|^${exec_prefix}/||"` +libexecdir=`echo "@libexecdir@" | sed "s|^${exec_prefix}/||"` +localapiarchlibdir=`echo "@localapiarchlibdir@" | sed "s|^${exec_prefix}/||"` +localapioctfiledir=`echo "@localapioctfiledir@" | sed "s|^${exec_prefix}/||"` +localarchlibdir=`echo "@localarchlibdir@" | sed "s|^${exec_prefix}/||"` +localoctfiledir=`echo "@localoctfiledir@" | sed "s|^${exec_prefix}/||"` +localverarchlibdir=`echo "@localverarchlibdir@" | sed "s|^${exec_prefix}/||"` +localveroctfiledir=`echo "@localveroctfiledir@" | sed "s|^${exec_prefix}/||"` +octfiledir=`echo "@octfiledir@" | sed "s|^${exec_prefix}/||"` octlibdir=`echo "@octlibdir@" | sed "s|^${exec_prefix}/||"` +datadir=`echo "@datadir@" | sed "s|^${prefix}/||"` +datarootdir=`echo "@datarootdir@" | sed "s|^${prefix}/||"` +doc_cache_file=`echo "@doc_cache_file@" | sed "s|^${prefix}/||"` +exec_prefix=`echo "@exec_prefix@" | sed "s|^${prefix}/||"` +fcnfiledir=`echo "@fcnfiledir@" | sed "s|^${prefix}/||"` +imagedir=`echo "@imagedir@" | sed "s|^${prefix}/||"` includedir=`echo "@includedir@" | sed "s|^${prefix}/||"` +infodir=`echo "@infodir@" | sed "s|^${prefix}/||"` +infofile=`echo "@infofile@" | sed "s|^${prefix}/||"` +localapifcnfiledir=`echo "@localapifcnfiledir@" | sed "s|^${prefix}/||"` +localfcnfiledir=`echo "@localfcnfiledir@" | sed "s|^${prefix}/||"` +localstartupfiledir=`echo "@localstartupfiledir@" | sed "s|^${prefix}/||"` +localapiarchlibdir=`echo "@localapiarchlibdir@" | sed "s|^${prefix}/||"` +localverfcnfiledir=`echo "@localverfcnfiledir@" | sed "s|^${prefix}/||"` +man1dir=`echo "@man1dir@" | sed "s|^${prefix}/||"` +mandir=`echo "@mandir@" | sed "s|^${prefix}/||"` +octdatadir=`echo "@octdatadir@" | sed "s|^${prefix}/||"` +octdocdir=`echo "@octdocdir@" | sed "s|^${prefix}/||"` +octetcdir=`echo "@octetcdir@" | sed "s|^${prefix}/||"` +octfontsdir=`echo "@octfontsdir@" | sed "s|^${prefix}/||"` octincludedir=`echo "@octincludedir@" | sed "s|^${prefix}/||"` +octlocaledir=`echo "@octlocaledir@" | sed "s|^${prefix}/||"` +octtestsdir=`echo "@octtestsdir@" | sed "s|^${prefix}/||"` +startupfiledir=`echo "@startupfiledir@" | sed "s|^${prefix}/||"` +texi_macros_file=`echo "@texi_macros_file@" | sed "s|^${prefix}/||"` srcdir="@srcdir@" top_srcdir="@top_srcdir@" @@ -196,7 +236,11 @@ $SED \ -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically by subst-config-vals.|" \ -e "s|%NO_OCT_FILE_STRIP%|${NO_OCT_FILE_STRIP}|" \ + -e "s|%OCTAVE_API_VERSION%|\"${api_version}\"|" \ + -e "s|%OCTAVE_ARCHLIBDIR%|\"${archlibdir}\"|" \ -e "s|%OCTAVE_BINDIR%|\"${bindir}\"|" \ + -e "s|%OCTAVE_BINDIR%|\"${bindir}\"|" \ + -e "s|%OCTAVE_CANONICAL_HOST_TYPE%|\"${canonical_host_type}\"|" \ -e "s|%OCTAVE_CONF_AMD_CPPFLAGS%|\"${AMD_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_AMD_LDFLAGS%|\"${AMD_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_AMD_LIBS%|\"${AMD_LIBS}\"|" \ @@ -235,25 +279,23 @@ -e "s|%OCTAVE_CONF_CXXPICFLAG%|\"${CXXPICFLAG}\"|" \ -e "s|%OCTAVE_CONF_DEFAULT_PAGER%|\"${DEFAULT_PAGER}\"|" \ -e "s|%OCTAVE_CONF_DEFS%|\"${DEFS}\"|" \ + -e "s|%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%|\"${DEPEND_EXTRA_SED_PATTERN}\"|" \ -e "s|%OCTAVE_CONF_DEPEND_FLAGS%|\"${DEPEND_FLAGS}\"|" \ - -e "s|%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%|\"${DEPEND_EXTRA_SED_PATTERN}\"|" \ -e "s|%OCTAVE_CONF_DL_LD%|\"${DL_LD}\"|" \ -e "s|%OCTAVE_CONF_DL_LDFLAGS%|\"${DL_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_DL_LIBS%|\"${DL_LIBS}\"|" \ -e "s|%OCTAVE_CONF_EXEC_PREFIX%|\"${exec_prefix}\"|" \ -e "s|%OCTAVE_CONF_EXEEXT%|\"${EXEEXT}\"|" \ - -e "s|%OCTAVE_CONF_GCC_VERSION%|\"${GCC_VERSION}\"|" \ - -e "s|%OCTAVE_CONF_GXX_VERSION%|\"${GXX_VERSION}\"|" \ -e "s|%OCTAVE_CONF_F77%|\"${F77}\"|" \ -e "s|%OCTAVE_CONF_F77_FLOAT_STORE_FLAG%|\"${F77_FLOAT_STORE_FLAG}\"|" \ -e "s|%OCTAVE_CONF_F77_INTEGER_8_FLAG%|\"${F77_INTEGER_8_FLAG}\"|" \ -e "s|%OCTAVE_CONF_FFLAGS%|\"${FFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_FFTW3F_CPPFLAGS%|\"${FFTW3F_CPPFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_FFTW3F_LDFLAGS%|\"${FFTW3F_LDFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_FFTW3F_LIBS%|\"${FFTW3F_LIBS}\"|" \ -e "s|%OCTAVE_CONF_FFTW3_CPPFLAGS%|\"${FFTW3_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_FFTW3_LDFLAGS%|\"${FFTW3_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_FFTW3_LIBS%|\"${FFTW3_LIBS}\"|" \ - -e "s|%OCTAVE_CONF_FFTW3F_CPPFLAGS%|\"${FFTW3F_CPPFLAGS}\"|" \ - -e "s|%OCTAVE_CONF_FFTW3F_LDFLAGS%|\"${FFTW3F_LDFLAGS}\"|" \ - -e "s|%OCTAVE_CONF_FFTW3F_LIBS%|\"${FFTW3F_LIBS}\"|" \ -e "s|%OCTAVE_CONF_FLIBS%|\"${FLIBS}\"|" \ -e "s|%OCTAVE_CONF_FLTK_CPPFLAGS%|\"${FLTK_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_FLTK_LDFLAGS%|\"${FLTK_LDFLAGS}\"|" \ @@ -261,22 +303,25 @@ -e "s|%OCTAVE_CONF_FONTCONFIG_CPPFLAGS%|\"${FONTCONFIG_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_FONTCONFIG_LIBS%|\"${FONTCONFIG_LIBS}\"|" \ -e "s|%OCTAVE_CONF_FPICFLAG%|\"${FPICFLAG}\"|" \ - -e "s|%OCTAVE_CONF_FT2_CPPFLAGS%|\"${FT2_CPPFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_FT2_CPPFLAGS%|\"${FT2_CPPFLAGS}\"|" | \ + $SED \ -e "s|%OCTAVE_CONF_FT2_LIBS%|\"${FT2_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_GCC_VERSION%|\"${GCC_VERSION}\"|" \ -e "s|%OCTAVE_CONF_GLPK_CPPFLAGS%|\"${GLPK_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_GLPK_LDFLAGS%|\"${GLPK_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_GLPK_LIBS%|\"${GLPK_LIBS}\"|" \ -e "s|%OCTAVE_CONF_GNUPLOT%|\"${GNUPLOT}\"|" \ - -e "s|%OCTAVE_CONF_HDF5_CPPFLAGS%|\"${HDF5_CPPFLAGS}\"|" | \ - $SED -e "s|%OCTAVE_CONF_HDF5_LDFLAGS%|\"${HDF5_LDFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_GXX_VERSION%|\"${GXX_VERSION}\"|" \ + -e "s|%OCTAVE_CONF_HDF5_CPPFLAGS%|\"${HDF5_CPPFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_HDF5_LDFLAGS%|\"${HDF5_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_HDF5_LIBS%|\"${HDF5_LIBS}\"|" \ -e "s|%OCTAVE_CONF_INCLUDEDIR%|\"${includedir}\"|" \ -e "s|%OCTAVE_CONF_KLU_CPPFLAGS%|\"${KLU_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_KLU_LDFLAGS%|\"${KLU_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_KLU_LIBS%|\"${KLU_LIBS}\"|" \ -e "s|%OCTAVE_CONF_LAPACK_LIBS%|\"${LAPACK_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_LDFLAGS%|\"${LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_LD_CXX%|\"${LD_CXX}\"|" \ - -e "s|%OCTAVE_CONF_LDFLAGS%|\"${LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_LD_STATIC_FLAG%|\"${LD_STATIC_FLAG}\"|" \ -e "s|%OCTAVE_CONF_LEX%|\"${LEX}\"|" \ -e "s|%OCTAVE_CONF_LEXLIB%|\"${LEXLIB}\"|" \ @@ -299,9 +344,9 @@ -e "s|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"${MKOCTFILE_DL_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_MKOCTFILE_F77%|\"${MKOCTFILE_F77}\"|" \ -e "s|%OCTAVE_CONF_MKOCTFILE_LD_CXX%|\"${MKOCTFILE_LD_CXX}\"|" \ - -e "s|%OCTAVE_CONF_MKOCTFILE_RANLIB%|\"${MKOCTFILE_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_MKOCTFILE_RANLIB%|\"${MKOCTFILE_RANLIB}\"|" \ -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}\"|" \ @@ -329,7 +374,8 @@ -e "s|%OCTAVE_CONF_QT_LIBS%|\"${QT_LIBS}\"|" \ -e "s|%OCTAVE_CONF_RANLIB%|\"${RANLIB}\"|" \ -e "s|%OCTAVE_CONF_RDYNAMIC_FLAG%|\"${RDYNAMIC_FLAG}\"|" \ - -e "s|%OCTAVE_CONF_READLINE_LIBS%|\"${READLINE_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_READLINE_LIBS%|\"${READLINE_LIBS}\"|" | \ + $SED \ -e "s|%OCTAVE_CONF_SED%|\"${SED}\"|" \ -e "s|%OCTAVE_CONF_SHARED_LIBS%|\"${SHARED_LIBS}\"|" \ -e "s|%OCTAVE_CONF_SH_LD%|\"${SH_LD}\"|" \ @@ -358,4 +404,45 @@ -e "s|%OCTAVE_CONF_Z_CPPFLAGS%|\"${Z_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_Z_LDFLAGS%|\"${Z_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_Z_LIBS%|\"${Z_LIBS}\"|" \ - -e "s|%OCTAVE_CONF_config_opts%|\"${config_opts}\"|" + -e "s|%OCTAVE_CONF_config_opts%|\"${config_opts}\"|" \ + -e "s|%OCTAVE_DATADIR%|\"${datadir}\"|" \ + -e "s|%OCTAVE_DATAROOTDIR%|\"${datarootdir}\"|" \ + -e "s|%OCTAVE_DEFAULT_PAGER%|\"${DEFAULT_PAGER}\"|" \ + -e "s|%OCTAVE_DOCDIR%|\"${docdir}\"|" \ + -e "s|%OCTAVE_DOC_CACHE_FILE%|\"${doc_cache_file}\"|" \ + -e "s|%OCTAVE_EXEC_PREFIX%|\"${exec_prefix}\"|" \ + -e "s|%OCTAVE_EXEEXT%|\"${EXEEXT}\"|" \ + -e "s|%OCTAVE_FCNFILEDIR%|\"${fcnfiledir}\"|" \ + -e "s|%OCTAVE_IMAGEDIR%|\"${imagedir}\"|" \ + -e "s|%OCTAVE_INCLUDEDIR%|\"${includedir}\"|" \ + -e "s|%OCTAVE_INFODIR%|\"${infodir}\"|" \ + -e "s|%OCTAVE_INFOFILE%|\"${infofile}\"|" \ + -e "s|%OCTAVE_LIBDIR%|\"${libdir}\"|" \ + -e "s|%OCTAVE_LIBEXECDIR%|\"${libexecdir}\"|" \ + -e "s|%OCTAVE_LOCALAPIARCHLIBDIR%|\"${localapiarchlibdir}\"|" \ + -e "s|%OCTAVE_LOCALAPIFCNFILEDIR%|\"${localapifcnfiledir}\"|" \ + -e "s|%OCTAVE_LOCALAPIOCTFILEDIR%|\"${localapioctfiledir}\"|" \ + -e "s|%OCTAVE_LOCALARCHLIBDIR%|\"${localarchlibdir}\"|" \ + -e "s|%OCTAVE_LOCALFCNFILEDIR%|\"${localfcnfiledir}\"|" \ + -e "s|%OCTAVE_LOCALOCTFILEDIR%|\"${localoctfiledir}\"|" \ + -e "s|%OCTAVE_LOCALSTARTUPFILEDIR%|\"${localstartupfiledir}\"|" \ + -e "s|%OCTAVE_LOCALVERARCHLIBDIR%|\"${localverarchlibdir}\"|" \ + -e "s|%OCTAVE_LOCALVERFCNFILEDIR%|\"${localverfcnfiledir}\"|" \ + -e "s|%OCTAVE_LOCALVEROCTFILEDIR%|\"${localveroctfiledir}\"|" \ + -e "s|%OCTAVE_MAN1DIR%|\"${man1dir}\"|" \ + -e "s|%OCTAVE_MAN1EXT%|\"${man1ext}\"|" \ + -e "s|%OCTAVE_MANDIR%|\"${mandir}\"|" \ + -e "s|%OCTAVE_OCTDATADIR%|\"${octdatadir}\"|" \ + -e "s|%OCTAVE_OCTDOCDIR%|\"${octdocdir}\"|" \ + -e "s|%OCTAVE_OCTETCDIR%|\"${octetcdir}\"|" \ + -e "s|%OCTAVE_OCTFILEDIR%|\"${octfiledir}\"|" \ + -e "s|%OCTAVE_OCTFONTSDIR%|\"${octfontsdir}\"|" \ + -e "s|%OCTAVE_OCTINCLUDEDIR%|\"${octincludedir}\"|" \ + -e "s|%OCTAVE_OCTLIBDIR%|\"${octlibdir}\"|" \ + -e "s|%OCTAVE_OCTLOCALEDIR%|\"${octlocaledir}\"|" \ + -e "s|%OCTAVE_OCTTESTSDIR%|\"${octtestsdir}\"|" \ + -e "s|%OCTAVE_PREFIX%|\"${prefix}\"|" \ + -e "s|%OCTAVE_RELEASE%|\"${OCTAVE_RELEASE}\"|" \ + -e "s|%OCTAVE_STARTUPFILEDIR%|\"${startupfiledir}\"|" \ + -e "s|%OCTAVE_TEXI_MACROS_FILE%|\"${texi_macros_file}\"|" \ + -e "s|%OCTAVE_VERSION%|\"${version}\"|"
--- a/build-aux/subst-cross-config-vals.in.sh Fri Jul 06 14:44:48 2018 -0700 +++ b/build-aux/subst-cross-config-vals.in.sh Fri Jul 06 19:20:40 2018 -0400 @@ -32,15 +32,55 @@ ## OCTAVE_CONF_MKOCTFILE_LD_CXX ## OCTAVE_CONF_MKOCTFILE_RANLIB +canonical_host_type="@canonical_host_type@" +DEFAULT_PAGER="@DEFAULT_PAGER@" +EXEEXT="@EXEEXT@" +man1ext="@man1ext@" +api_version="@OCTAVE_API_VERSION@" +OCTAVE_RELEASE="" +version="@PACKAGE_VERSION@" + prefix="@prefix@" exec_prefix="@exec_prefix@" +archlibdir=`echo "@archlibdir@" | sed "s|^${exec_prefix}/||"` bindir=`echo "@bindir@" | sed "s|^${exec_prefix}/||"` libdir=`echo "@libdir@" | sed "s|^${exec_prefix}/||"` +libexecdir=`echo "@libexecdir@" | sed "s|^${exec_prefix}/||"` +localapiarchlibdir=`echo "@localapiarchlibdir@" | sed "s|^${exec_prefix}/||"` +localapioctfiledir=`echo "@localapioctfiledir@" | sed "s|^${exec_prefix}/||"` +localarchlibdir=`echo "@localarchlibdir@" | sed "s|^${exec_prefix}/||"` +localoctfiledir=`echo "@localoctfiledir@" | sed "s|^${exec_prefix}/||"` +localverarchlibdir=`echo "@localverarchlibdir@" | sed "s|^${exec_prefix}/||"` +localveroctfiledir=`echo "@localveroctfiledir@" | sed "s|^${exec_prefix}/||"` +octfiledir=`echo "@octfiledir@" | sed "s|^${exec_prefix}/||"` octlibdir=`echo "@octlibdir@" | sed "s|^${exec_prefix}/||"` +datadir=`echo "@datadir@" | sed "s|^${prefix}/||"` +datarootdir=`echo "@datarootdir@" | sed "s|^${prefix}/||"` +doc_cache_file=`echo "@doc_cache_file@" | sed "s|^${prefix}/||"` +exec_prefix=`echo "@exec_prefix@" | sed "s|^${prefix}/||"` +fcnfiledir=`echo "@fcnfiledir@" | sed "s|^${prefix}/||"` +imagedir=`echo "@imagedir@" | sed "s|^${prefix}/||"` includedir=`echo "@includedir@" | sed "s|^${prefix}/||"` +infodir=`echo "@infodir@" | sed "s|^${prefix}/||"` +infofile=`echo "@infofile@" | sed "s|^${prefix}/||"` +localapifcnfiledir=`echo "@localapifcnfiledir@" | sed "s|^${prefix}/||"` +localfcnfiledir=`echo "@localfcnfiledir@" | sed "s|^${prefix}/||"` +localstartupfiledir=`echo "@localstartupfiledir@" | sed "s|^${prefix}/||"` +localapiarchlibdir=`echo "@localapiarchlibdir@" | sed "s|^${prefix}/||"` +localverfcnfiledir=`echo "@localverfcnfiledir@" | sed "s|^${prefix}/||"` +man1dir=`echo "@man1dir@" | sed "s|^${prefix}/||"` +mandir=`echo "@mandir@" | sed "s|^${prefix}/||"` +octdatadir=`echo "@octdatadir@" | sed "s|^${prefix}/||"` +octdocdir=`echo "@octdocdir@" | sed "s|^${prefix}/||"` +octetcdir=`echo "@octetcdir@" | sed "s|^${prefix}/||"` +octfontsdir=`echo "@octfontsdir@" | sed "s|^${prefix}/||"` octincludedir=`echo "@octincludedir@" | sed "s|^${prefix}/||"` +octlocaledir=`echo "@octlocaledir@" | sed "s|^${prefix}/||"` +octtestsdir=`echo "@octtestsdir@" | sed "s|^${prefix}/||"` +startupfiledir=`echo "@startupfiledir@" | sed "s|^${prefix}/||"` +texi_macros_file=`echo "@texi_macros_file@" | sed "s|^${prefix}/||"` srcdir="@srcdir@" top_srcdir="@top_srcdir@" @@ -198,9 +238,13 @@ config_opts="@config_opts@" $SED \ - -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically by subst-config-vals.|" \ + -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically by subst-cross-config-vals.|" \ -e "s|%NO_OCT_FILE_STRIP%|${NO_OCT_FILE_STRIP}|" \ + -e "s|%OCTAVE_API_VERSION%|\"${api_version}\"|" \ + -e "s|%OCTAVE_ARCHLIBDIR%|\"${archlibdir}\"|" \ -e "s|%OCTAVE_BINDIR%|\"${bindir}\"|" \ + -e "s|%OCTAVE_BINDIR%|\"${bindir}\"|" \ + -e "s|%OCTAVE_CANONICAL_HOST_TYPE%|\"${canonical_host_type}\"|" \ -e "s|%OCTAVE_CONF_AMD_CPPFLAGS%|\"${AMD_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_AMD_LDFLAGS%|\"${AMD_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_AMD_LIBS%|\"${AMD_LIBS}\"|" \ @@ -239,25 +283,23 @@ -e "s|%OCTAVE_CONF_CXXPICFLAG%|\"${CXXPICFLAG}\"|" \ -e "s|%OCTAVE_CONF_DEFAULT_PAGER%|\"${DEFAULT_PAGER}\"|" \ -e "s|%OCTAVE_CONF_DEFS%|\"${DEFS}\"|" \ + -e "s|%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%|\"${DEPEND_EXTRA_SED_PATTERN}\"|" \ -e "s|%OCTAVE_CONF_DEPEND_FLAGS%|\"${DEPEND_FLAGS}\"|" \ - -e "s|%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%|\"${DEPEND_EXTRA_SED_PATTERN}\"|" \ -e "s|%OCTAVE_CONF_DL_LD%|\"${DL_LD}\"|" \ -e "s|%OCTAVE_CONF_DL_LDFLAGS%|\"${DL_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_DL_LIBS%|\"${DL_LIBS}\"|" \ -e "s|%OCTAVE_CONF_EXEC_PREFIX%|\"${exec_prefix}\"|" \ -e "s|%OCTAVE_CONF_EXEEXT%|\"${EXEEXT}\"|" \ - -e "s|%OCTAVE_CONF_GCC_VERSION%|\"${GCC_VERSION}\"|" \ - -e "s|%OCTAVE_CONF_GXX_VERSION%|\"${GXX_VERSION}\"|" \ -e "s|%OCTAVE_CONF_F77%|\"${F77}\"|" \ -e "s|%OCTAVE_CONF_F77_FLOAT_STORE_FLAG%|\"${F77_FLOAT_STORE_FLAG}\"|" \ -e "s|%OCTAVE_CONF_F77_INTEGER_8_FLAG%|\"${F77_INTEGER_8_FLAG}\"|" \ -e "s|%OCTAVE_CONF_FFLAGS%|\"${FFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_FFTW3F_CPPFLAGS%|\"${FFTW3F_CPPFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_FFTW3F_LDFLAGS%|\"${FFTW3F_LDFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_FFTW3F_LIBS%|\"${FFTW3F_LIBS}\"|" \ -e "s|%OCTAVE_CONF_FFTW3_CPPFLAGS%|\"${FFTW3_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_FFTW3_LDFLAGS%|\"${FFTW3_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_FFTW3_LIBS%|\"${FFTW3_LIBS}\"|" \ - -e "s|%OCTAVE_CONF_FFTW3F_CPPFLAGS%|\"${FFTW3F_CPPFLAGS}\"|" \ - -e "s|%OCTAVE_CONF_FFTW3F_LDFLAGS%|\"${FFTW3F_LDFLAGS}\"|" \ - -e "s|%OCTAVE_CONF_FFTW3F_LIBS%|\"${FFTW3F_LIBS}\"|" \ -e "s|%OCTAVE_CONF_FLIBS%|\"${FLIBS}\"|" \ -e "s|%OCTAVE_CONF_FLTK_CPPFLAGS%|\"${FLTK_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_FLTK_LDFLAGS%|\"${FLTK_LDFLAGS}\"|" \ @@ -265,22 +307,25 @@ -e "s|%OCTAVE_CONF_FONTCONFIG_CPPFLAGS%|\"${FONTCONFIG_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_FONTCONFIG_LIBS%|\"${FONTCONFIG_LIBS}\"|" \ -e "s|%OCTAVE_CONF_FPICFLAG%|\"${FPICFLAG}\"|" \ - -e "s|%OCTAVE_CONF_FT2_CPPFLAGS%|\"${FT2_CPPFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_FT2_CPPFLAGS%|\"${FT2_CPPFLAGS}\"|" | \ + $SED \ -e "s|%OCTAVE_CONF_FT2_LIBS%|\"${FT2_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_GCC_VERSION%|\"${GCC_VERSION}\"|" \ -e "s|%OCTAVE_CONF_GLPK_CPPFLAGS%|\"${GLPK_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_GLPK_LDFLAGS%|\"${GLPK_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_GLPK_LIBS%|\"${GLPK_LIBS}\"|" \ -e "s|%OCTAVE_CONF_GNUPLOT%|\"${GNUPLOT}\"|" \ - -e "s|%OCTAVE_CONF_HDF5_CPPFLAGS%|\"${HDF5_CPPFLAGS}\"|" | \ - $SED -e "s|%OCTAVE_CONF_HDF5_LDFLAGS%|\"${HDF5_LDFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_GXX_VERSION%|\"${GXX_VERSION}\"|" \ + -e "s|%OCTAVE_CONF_HDF5_CPPFLAGS%|\"${HDF5_CPPFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_HDF5_LDFLAGS%|\"${HDF5_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_HDF5_LIBS%|\"${HDF5_LIBS}\"|" \ -e "s|%OCTAVE_CONF_INCLUDEDIR%|\"${includedir}\"|" \ -e "s|%OCTAVE_CONF_KLU_CPPFLAGS%|\"${KLU_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_KLU_LDFLAGS%|\"${KLU_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_KLU_LIBS%|\"${KLU_LIBS}\"|" \ -e "s|%OCTAVE_CONF_LAPACK_LIBS%|\"${LAPACK_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_LDFLAGS%|\"${LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_LD_CXX%|\"${LD_CXX}\"|" \ - -e "s|%OCTAVE_CONF_LDFLAGS%|\"${LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_LD_STATIC_FLAG%|\"${LD_STATIC_FLAG}\"|" \ -e "s|%OCTAVE_CONF_LEX%|\"${LEX}\"|" \ -e "s|%OCTAVE_CONF_LEXLIB%|\"${LEXLIB}\"|" \ @@ -303,9 +348,9 @@ -e "s|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"${DL_LDFLAGS}\"|" \ -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_MKOCTFILE_RANLIB%|\"${RANLIB}\"|" \ -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}\"|" \ @@ -333,7 +378,8 @@ -e "s|%OCTAVE_CONF_QT_LIBS%|\"${QT_LIBS}\"|" \ -e "s|%OCTAVE_CONF_RANLIB%|\"${RANLIB}\"|" \ -e "s|%OCTAVE_CONF_RDYNAMIC_FLAG%|\"${RDYNAMIC_FLAG}\"|" \ - -e "s|%OCTAVE_CONF_READLINE_LIBS%|\"${READLINE_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_READLINE_LIBS%|\"${READLINE_LIBS}\"|" | \ + $SED \ -e "s|%OCTAVE_CONF_SED%|\"${SED}\"|" \ -e "s|%OCTAVE_CONF_SHARED_LIBS%|\"${SHARED_LIBS}\"|" \ -e "s|%OCTAVE_CONF_SH_LD%|\"${SH_LD}\"|" \ @@ -362,4 +408,45 @@ -e "s|%OCTAVE_CONF_Z_CPPFLAGS%|\"${Z_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_Z_LDFLAGS%|\"${Z_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_Z_LIBS%|\"${Z_LIBS}\"|" \ - -e "s|%OCTAVE_CONF_config_opts%|\"${config_opts}\"|" + -e "s|%OCTAVE_CONF_config_opts%|\"${config_opts}\"|" \ + -e "s|%OCTAVE_DATADIR%|\"${datadir}\"|" \ + -e "s|%OCTAVE_DATAROOTDIR%|\"${datarootdir}\"|" \ + -e "s|%OCTAVE_DEFAULT_PAGER%|\"${DEFAULT_PAGER}\"|" \ + -e "s|%OCTAVE_DOCDIR%|\"${docdir}\"|" \ + -e "s|%OCTAVE_DOC_CACHE_FILE%|\"${doc_cache_file}\"|" \ + -e "s|%OCTAVE_EXEC_PREFIX%|\"${exec_prefix}\"|" \ + -e "s|%OCTAVE_EXEEXT%|\"${EXEEXT}\"|" \ + -e "s|%OCTAVE_FCNFILEDIR%|\"${fcnfiledir}\"|" \ + -e "s|%OCTAVE_IMAGEDIR%|\"${imagedir}\"|" \ + -e "s|%OCTAVE_INCLUDEDIR%|\"${includedir}\"|" \ + -e "s|%OCTAVE_INFODIR%|\"${infodir}\"|" \ + -e "s|%OCTAVE_INFOFILE%|\"${infofile}\"|" \ + -e "s|%OCTAVE_LIBDIR%|\"${libdir}\"|" \ + -e "s|%OCTAVE_LIBEXECDIR%|\"${libexecdir}\"|" \ + -e "s|%OCTAVE_LOCALAPIARCHLIBDIR%|\"${localapiarchlibdir}\"|" \ + -e "s|%OCTAVE_LOCALAPIFCNFILEDIR%|\"${localapifcnfiledir}\"|" \ + -e "s|%OCTAVE_LOCALAPIOCTFILEDIR%|\"${localapioctfiledir}\"|" \ + -e "s|%OCTAVE_LOCALARCHLIBDIR%|\"${localarchlibdir}\"|" \ + -e "s|%OCTAVE_LOCALFCNFILEDIR%|\"${localfcnfiledir}\"|" \ + -e "s|%OCTAVE_LOCALOCTFILEDIR%|\"${localoctfiledir}\"|" \ + -e "s|%OCTAVE_LOCALSTARTUPFILEDIR%|\"${localstartupfiledir}\"|" \ + -e "s|%OCTAVE_LOCALVERARCHLIBDIR%|\"${localverarchlibdir}\"|" \ + -e "s|%OCTAVE_LOCALVERFCNFILEDIR%|\"${localverfcnfiledir}\"|" \ + -e "s|%OCTAVE_LOCALVEROCTFILEDIR%|\"${localveroctfiledir}\"|" \ + -e "s|%OCTAVE_MAN1DIR%|\"${man1dir}\"|" \ + -e "s|%OCTAVE_MAN1EXT%|\"${man1ext}\"|" \ + -e "s|%OCTAVE_MANDIR%|\"${mandir}\"|" \ + -e "s|%OCTAVE_OCTDATADIR%|\"${octdatadir}\"|" \ + -e "s|%OCTAVE_OCTDOCDIR%|\"${octdocdir}\"|" \ + -e "s|%OCTAVE_OCTETCDIR%|\"${octetcdir}\"|" \ + -e "s|%OCTAVE_OCTFILEDIR%|\"${octfiledir}\"|" \ + -e "s|%OCTAVE_OCTFONTSDIR%|\"${octfontsdir}\"|" \ + -e "s|%OCTAVE_OCTINCLUDEDIR%|\"${octincludedir}\"|" \ + -e "s|%OCTAVE_OCTLIBDIR%|\"${octlibdir}\"|" \ + -e "s|%OCTAVE_OCTLOCALEDIR%|\"${octlocaledir}\"|" \ + -e "s|%OCTAVE_OCTTESTSDIR%|\"${octtestsdir}\"|" \ + -e "s|%OCTAVE_PREFIX%|\"${prefix}\"|" \ + -e "s|%OCTAVE_RELEASE%|\"${OCTAVE_RELEASE}\"|" \ + -e "s|%OCTAVE_STARTUPFILEDIR%|\"${startupfiledir}\"|" \ + -e "s|%OCTAVE_TEXI_MACROS_FILE%|\"${texi_macros_file}\"|" \ + -e "s|%OCTAVE_VERSION%|\"${version}\"|"
--- a/build-aux/subst-default-vals.in.sh Fri Jul 06 14:44:48 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,119 +0,0 @@ -#! /bin/sh -# -# Copyright (C) 2016-2018 John W. Eaton -# -# This file is part of Octave. -# -# Octave is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Octave is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Octave; see the file COPYING. If not, see -# <https://www.gnu.org/licenses/>. - -: ${SED=@SED@} - -canonical_host_type="@canonical_host_type@" -DEFAULT_PAGER="@DEFAULT_PAGER@" -EXEEXT="@EXEEXT@" -man1ext="@man1ext@" -api_version="@OCTAVE_API_VERSION@" -OCTAVE_RELEASE="" -version="@PACKAGE_VERSION@" - -prefix="@prefix@" -exec_prefix="@exec_prefix@" - -archlibdir=`echo "@archlibdir@" | sed "s|^${exec_prefix}/||"` -bindir=`echo "@bindir@" | sed "s|^${exec_prefix}/||"` -libdir=`echo "@libdir@" | sed "s|^${exec_prefix}/||"` -libexecdir=`echo "@libexecdir@" | sed "s|^${exec_prefix}/||"` -localapiarchlibdir=`echo "@localapiarchlibdir@" | sed "s|^${exec_prefix}/||"` -localapioctfiledir=`echo "@localapioctfiledir@" | sed "s|^${exec_prefix}/||"` -localarchlibdir=`echo "@localarchlibdir@" | sed "s|^${exec_prefix}/||"` -localoctfiledir=`echo "@localoctfiledir@" | sed "s|^${exec_prefix}/||"` -localverarchlibdir=`echo "@localverarchlibdir@" | sed "s|^${exec_prefix}/||"` -localveroctfiledir=`echo "@localveroctfiledir@" | sed "s|^${exec_prefix}/||"` -octfiledir=`echo "@octfiledir@" | sed "s|^${exec_prefix}/||"` -octlibdir=`echo "@octlibdir@" | sed "s|^${exec_prefix}/||"` - -datadir=`echo "@datadir@" | sed "s|^${prefix}/||"` -datarootdir=`echo "@datarootdir@" | sed "s|^${prefix}/||"` -doc_cache_file=`echo "@doc_cache_file@" | sed "s|^${prefix}/||"` -exec_prefix=`echo "@exec_prefix@" | sed "s|^${prefix}/||"` -fcnfiledir=`echo "@fcnfiledir@" | sed "s|^${prefix}/||"` -imagedir=`echo "@imagedir@" | sed "s|^${prefix}/||"` -includedir=`echo "@includedir@" | sed "s|^${prefix}/||"` -infodir=`echo "@infodir@" | sed "s|^${prefix}/||"` -infofile=`echo "@infofile@" | sed "s|^${prefix}/||"` -localapifcnfiledir=`echo "@localapifcnfiledir@" | sed "s|^${prefix}/||"` -localfcnfiledir=`echo "@localfcnfiledir@" | sed "s|^${prefix}/||"` -localstartupfiledir=`echo "@localstartupfiledir@" | sed "s|^${prefix}/||"` -localapiarchlibdir=`echo "@localapiarchlibdir@" | sed "s|^${prefix}/||"` -localverfcnfiledir=`echo "@localverfcnfiledir@" | sed "s|^${prefix}/||"` -man1dir=`echo "@man1dir@" | sed "s|^${prefix}/||"` -mandir=`echo "@mandir@" | sed "s|^${prefix}/||"` -octdatadir=`echo "@octdatadir@" | sed "s|^${prefix}/||"` -octdocdir=`echo "@octdocdir@" | sed "s|^${prefix}/||"` -octetcdir=`echo "@octetcdir@" | sed "s|^${prefix}/||"` -octfontsdir=`echo "@octfontsdir@" | sed "s|^${prefix}/||"` -octincludedir=`echo "@octincludedir@" | sed "s|^${prefix}/||"` -octlocaledir=`echo "@octlocaledir@" | sed "s|^${prefix}/||"` -octtestsdir=`echo "@octtestsdir@" | sed "s|^${prefix}/||"` -startupfiledir=`echo "@startupfiledir@" | sed "s|^${prefix}/||"` -texi_macros_file=`echo "@texi_macros_file@" | sed "s|^${prefix}/||"` - -$SED \ - -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically by subst-default-vals.|" \ - -e "s|%OCTAVE_ARCHLIBDIR%|\"${archlibdir}\"|" \ - -e "s|%OCTAVE_BINDIR%|\"${bindir}\"|" \ - -e "s|%OCTAVE_CANONICAL_HOST_TYPE%|\"${canonical_host_type}\"|" \ - -e "s|%OCTAVE_DATADIR%|\"${datadir}\"|" \ - -e "s|%OCTAVE_DATAROOTDIR%|\"${datarootdir}\"|" \ - -e "s|%OCTAVE_DOCDIR%|\"${docdir}\"|" \ - -e "s|%OCTAVE_DEFAULT_PAGER%|\"${DEFAULT_PAGER}\"|" \ - -e "s|%OCTAVE_DOC_CACHE_FILE%|\"${doc_cache_file}\"|" \ - -e "s|%OCTAVE_EXEC_PREFIX%|\"${exec_prefix}\"|" \ - -e "s|%OCTAVE_EXEEXT%|\"${EXEEXT}\"|" \ - -e "s|%OCTAVE_FCNFILEDIR%|\"${fcnfiledir}\"|" \ - -e "s|%OCTAVE_IMAGEDIR%|\"${imagedir}\"|" \ - -e "s|%OCTAVE_INCLUDEDIR%|\"${includedir}\"|" \ - -e "s|%OCTAVE_INFODIR%|\"${infodir}\"|" \ - -e "s|%OCTAVE_INFOFILE%|\"${infofile}\"|" \ - -e "s|%OCTAVE_LIBDIR%|\"${libdir}\"|" \ - -e "s|%OCTAVE_LIBEXECDIR%|\"${libexecdir}\"|" \ - -e "s|%OCTAVE_LOCALAPIFCNFILEDIR%|\"${localapifcnfiledir}\"|" \ - -e "s|%OCTAVE_LOCALAPIOCTFILEDIR%|\"${localapioctfiledir}\"|" \ - -e "s|%OCTAVE_LOCALARCHLIBDIR%|\"${localarchlibdir}\"|" \ - -e "s|%OCTAVE_LOCALFCNFILEDIR%|\"${localfcnfiledir}\"|" \ - -e "s|%OCTAVE_LOCALOCTFILEDIR%|\"${localoctfiledir}\"|" \ - -e "s|%OCTAVE_LOCALSTARTUPFILEDIR%|\"${localstartupfiledir}\"|" \ - -e "s|%OCTAVE_LOCALAPIARCHLIBDIR%|\"${localapiarchlibdir}\"|" \ - -e "s|%OCTAVE_LOCALVERARCHLIBDIR%|\"${localverarchlibdir}\"|" \ - -e "s|%OCTAVE_LOCALVERFCNFILEDIR%|\"${localverfcnfiledir}\"|" \ - -e "s|%OCTAVE_LOCALVEROCTFILEDIR%|\"${localveroctfiledir}\"|" \ - -e "s|%OCTAVE_MAN1DIR%|\"${man1dir}\"|" \ - -e "s|%OCTAVE_MAN1EXT%|\"${man1ext}\"|" \ - -e "s|%OCTAVE_MANDIR%|\"${mandir}\"|" \ - -e "s|%OCTAVE_OCTDATADIR%|\"${octdatadir}\"|" \ - -e "s|%OCTAVE_OCTDOCDIR%|\"${octdocdir}\"|" \ - -e "s|%OCTAVE_OCTETCDIR%|\"${octetcdir}\"|" \ - -e "s|%OCTAVE_OCTFILEDIR%|\"${octfiledir}\"|" \ - -e "s|%OCTAVE_OCTFONTSDIR%|\"${octfontsdir}\"|" \ - -e "s|%OCTAVE_OCTINCLUDEDIR%|\"${octincludedir}\"|" \ - -e "s|%OCTAVE_OCTLIBDIR%|\"${octlibdir}\"|" \ - -e "s|%OCTAVE_OCTLOCALEDIR%|\"${octlocaledir}\"|" \ - -e "s|%OCTAVE_OCTTESTSDIR%|\"${octtestsdir}\"|" \ - -e "s|%OCTAVE_STARTUPFILEDIR%|\"${startupfiledir}\"|" \ - -e "s|%OCTAVE_PREFIX%|\"${prefix}\"|" \ - -e "s|%OCTAVE_API_VERSION%|\"${api_version}\"|" \ - -e "s|%OCTAVE_RELEASE%|\"${OCTAVE_RELEASE}\"|" \ - -e "s|%OCTAVE_TEXI_MACROS_FILE%|\"${texi_macros_file}\"|" \ - -e "s|%OCTAVE_VERSION%|\"${version}\"|"
--- a/configure.ac Fri Jul 06 14:44:48 2018 -0700 +++ b/configure.ac Fri Jul 06 19:20:40 2018 -0400 @@ -3306,7 +3306,6 @@ libinterp/corefcn/mk-mxarray-h.sh build-aux/subst-config-vals.sh build-aux/subst-cross-config-vals.sh - build-aux/subst-default-vals.sh build-aux/subst-script-vals.sh]) AC_OUTPUT
--- a/libinterp/corefcn/module.mk Fri Jul 06 14:44:48 2018 -0700 +++ b/libinterp/corefcn/module.mk Fri Jul 06 19:20:40 2018 -0400 @@ -260,8 +260,8 @@ ## Special rules for sources which must be built before rest of compilation. -%reldir%/default-defs.h: %reldir%/default-defs.in.h build-aux/subst-default-vals.sh | %reldir%/$(octave_dirstamp) - $(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-default-vals.sh) +%reldir%/default-defs.h: %reldir%/default-defs.in.h build-aux/subst-config-vals.sh | %reldir%/$(octave_dirstamp) + $(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-config-vals.sh) %reldir%/graphics.h: %reldir%/graphics.in.h %reldir%/genprops.awk | %reldir%/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \
--- a/src/mkoctfile.in.cc Fri Jul 06 14:44:48 2018 -0700 +++ b/src/mkoctfile.in.cc Fri Jul 06 19:20:40 2018 -0400 @@ -151,6 +151,40 @@ vars["OCTAVE_HOME"] = Voctave_home; vars["OCTAVE_EXEC_HOME"] = Voctave_exec_home; + vars["API_VERSION"] = %OCTAVE_API_VERSION%; + vars["CANONICAL_HOST_TYPE"] = %OCTAVE_CANONICAL_HOST_TYPE%; + vars["DEFAULT_PAGER"] = %OCTAVE_DEFAULT_PAGER%; + vars["EXEEXT"] = %OCTAVE_EXEEXT%; + vars["MAN1EXT"] = %OCTAVE_MAN1EXT%; + vars["VERSION"] = %OCTAVE_VERSION%; + + vars["ARCHLIBDIR"] = prepend_octave_exec_home (%OCTAVE_ARCHLIBDIR%); + vars["BINDIR"] = prepend_octave_exec_home (%OCTAVE_BINDIR%); + vars["DATADIR"] = prepend_octave_home (%OCTAVE_DATADIR%); + vars["DATAROOTDIR"] = prepend_octave_home (%OCTAVE_DATAROOTDIR%); + vars["FCNFILEDIR"] = prepend_octave_home (%OCTAVE_FCNFILEDIR%); + vars["IMAGEDIR"] = prepend_octave_home (%OCTAVE_IMAGEDIR%); + vars["INFODIR"] = prepend_octave_home (%OCTAVE_INFODIR%); + vars["INFOFILE"] = prepend_octave_home (%OCTAVE_INFOFILE%); + vars["LIBEXECDIR"] = prepend_octave_exec_home (%OCTAVE_LIBEXECDIR%); + vars["LOCALAPIARCHLIBDIR"] = prepend_octave_exec_home (%OCTAVE_LOCALAPIARCHLIBDIR%); + vars["LOCALAPIFCNFILEDIR"] = prepend_octave_home (%OCTAVE_LOCALAPIFCNFILEDIR%); + vars["LOCALAPIOCTFILEDIR"] = prepend_octave_exec_home (%OCTAVE_LOCALAPIOCTFILEDIR%); + vars["LOCALARCHLIBDIR"] = prepend_octave_exec_home (%OCTAVE_LOCALARCHLIBDIR%); + vars["LOCALFCNFILEDIR"] = prepend_octave_home (%OCTAVE_LOCALFCNFILEDIR%); + vars["LOCALOCTFILEDIR"] = prepend_octave_exec_home (%OCTAVE_LOCALOCTFILEDIR%); + vars["LOCALSTARTUPFILEDIR"] = prepend_octave_home (%OCTAVE_LOCALSTARTUPFILEDIR%); + vars["LOCALVERARCHLIBDIR"] = prepend_octave_exec_home (%OCTAVE_LOCALVERARCHLIBDIR%); + vars["LOCALVERFCNFILEDIR"] = prepend_octave_home (%OCTAVE_LOCALVERFCNFILEDIR%); + vars["LOCALVEROCTFILEDIR"] = prepend_octave_exec_home (%OCTAVE_LOCALVEROCTFILEDIR%); + vars["MAN1DIR"] = prepend_octave_home (%OCTAVE_MAN1DIR%); + vars["MANDIR"] = prepend_octave_home (%OCTAVE_MANDIR%); + vars["OCTDATADIR"] = prepend_octave_home (%OCTAVE_OCTDATADIR%); + vars["OCTDOCDIR"] = prepend_octave_home (%OCTAVE_OCTDOCDIR%); + vars["OCTFILEDIR"] = prepend_octave_exec_home (%OCTAVE_OCTFILEDIR%); + vars["OCTFONTSDIR"] = prepend_octave_home (%OCTAVE_OCTFONTSDIR%); + vars["STARTUPFILEDIR"] = prepend_octave_home (%OCTAVE_STARTUPFILEDIR%); + vars["SED"] = get_variable ("SED", %OCTAVE_CONF_SED%); vars["OCTINCLUDEDIR"] @@ -348,36 +382,81 @@ "\n" " -g Enable debugging options for compilers.\n" "\n" -" -p VAR, --print VAR Print configuration variable VAR. Recognized\n" -" variables are:\n" +" -p VAR, --print VAR Print configuration variable VAR. There are\n" +" three categories of variables:\n" +"\n" +" Octave configuration variables that users may\n" +" override with environment variables. These are\n" +" used in commands that mkoctfile executes.\n" +"\n" +" ALL_CFLAGS LAPACK_LIBS\n" +" ALL_CXXFLAGS LD_CXX\n" +" ALL_FFLAGS LDFLAGS\n" +" ALL_LDFLAGS LD_STATIC_FLAG\n" +" BLAS_LIBS LFLAGS\n" +" CC LIBDIR\n" +" CFLAGS LIBOCTAVE\n" +" CPICFLAG LIBOCTINTERP\n" +" CPPFLAGS OCTAVE_LINK_OPTS\n" +" CXX OCTINCLUDEDIR\n" +" CXXFLAGS OCTAVE_LIBS\n" +" CXXPICFLAG OCTAVE_LINK_DEPS\n" +" DL_LD OCTLIBDIR\n" +" DL_LDFLAGS OCT_LINK_DEPS\n" +" F77 OCT_LINK_OPTS\n" +" F77_INTEGER8_FLAG RDYNAMIC_FLAG\n" +" FFLAGS SPECIAL_MATH_LIB\n" +" FPICFLAG XTRA_CFLAGS\n" +" INCFLAGS XTRA_CXXFLAGS\n" +" INCLUDEDIR\n" +"\n" +" Octave configuration variables as above, but\n" +" currently unused by mkoctfile.\n" "\n" -" ALL_CFLAGS INCFLAGS\n" -" ALL_CXXFLAGS INCLUDEDIR\n" -" ALL_FFLAGS LAPACK_LIBS\n" -" ALL_LDFLAGS LD_CXX\n" -" AR LDFLAGS\n" -" BLAS_LIBS LD_STATIC_FLAG\n" -" CC LFLAGS\n" -" CFLAGS LIBDIR\n" -" CPICFLAG LIBOCTAVE\n" -" CPPFLAGS LIBOCTINTERP\n" -" CXX LIBS\n" -" CXXFLAGS OCTAVE_EXEC_HOME\n" -" CXXPICFLAG OCTAVE_HOME\n" -" DEPEND_EXTRA_SED_PATTERN OCTAVE_LIBS\n" -" DEPEND_FLAGS OCTAVE_LINK_DEPS\n" -" DL_LD OCTAVE_LINK_OPTS\n" -" DL_LDFLAGS OCTINCLUDEDIR\n" -" F77 OCTLIBDIR\n" -" F77_INTEGER8_FLAG OCT_LINK_DEPS\n" -" FFLAGS OCT_LINK_OPTS\n" -" FFTW3F_LDFLAGS RANLIB\n" -" FFTW3F_LIBS RDYNAMIC_FLAG\n" -" FFTW3_LDFLAGS READLINE_LIBS\n" -" FFTW3_LIBS SED\n" -" FFTW_LIBS SPECIAL_MATH_LIB\n" -" FLIBS XTRA_CFLAGS\n" -" FPICFLAG XTRA_CXXFLAGS\n" +" AR\n" +" DEPEND_EXTRA_SED_PATTERN\n" +" DEPEND_FLAGS\n" +" FFTW3F_LDFLAGS\n" +" FFTW3F_LIBS\n" +" FFTW3_LDFLAGS\n" +" FFTW3_LIBS\n" +" FFTW_LIBS\n" +" FLIBS\n" +" LIBS\n" +" RANLIB\n" +" READLINE_LIBS\n" +" SED\n" +"\n" +" Octave configuration variables that are provided\n" +" for informational purposes only. Except for\n" +" OCTAVE_HOME and OCTAVE_EXEC_HOME, users may not\n" +" override these variables.\n" +"\n" +" If OCTAVE_HOME or OCTAVE_EXEC_HOME are set in\n" +" the environment, then other variables are adjusted\n" +" accordingly with OCTAVE_HOME or OCTAVE_EXEC_HOME\n" +" substituted for the original value of the directory\n" +" specified by the --prefix or --exec-prefix options\n" +" that were used when Octave was configured.\n" +"\n" +" API_VERSION LOCALFCNFILEDIR\n" +" ARCHLIBDIR LOCALOCTFILEDIR\n" +" BINDIR LOCALSTARTUPFILEDIR\n" +" CANONICAL_HOST_TYPE LOCALVERARCHLIBDIR\n" +" DATADIR LOCALVERFCNFILEDIR\n" +" DATAROOTDIR LOCALVEROCTFILEDIR\n" +" DEFAULT_PAGER MAN1DIR\n" +" EXEC_PREFIX MAN1EXT\n" +" EXEEXT MANDIR\n" +" FCNFILEDIR OCTAVE_EXEC_HOME\n" +" IMAGEDIR OCTAVE_HOME\n" +" INFODIR OCTDATADIR\n" +" INFOFILE OCTDOCDIR\n" +" LIBEXECDIR OCTFILEDIR\n" +" LOCALAPIARCHLIBDIR OCTFONTSDIR\n" +" LOCALAPIFCNFILEDIR STARTUPFILEDIR\n" +" LOCALAPIOCTFILEDIR VERSION\n" +" LOCALARCHLIBDIR\n" "\n" " --link-stand-alone Link a stand-alone executable file.\n" "\n"
--- a/src/module.mk Fri Jul 06 14:44:48 2018 -0700 +++ b/src/module.mk Fri Jul 06 19:20:40 2018 -0400 @@ -184,8 +184,8 @@ %reldir%/$(host_triplet)-octave-config$(BUILD_EXEEXT): %reldir%/$(host_triplet)-octave-config.cc $(BUILD_CXX) -o %reldir%/$(host_triplet)-octave-config$(BUILD_EXEEXT) -DCROSS=1 $(DEFAULT_INCLUDES) $(BUILD_CXXFLAGS) $(BUILD_LDFLAGS) -I$(srcdir)/src %reldir%/$(host_triplet)-octave-config.cc -%reldir%/$(host_triplet)-octave-config.cc: %reldir%/octave-config.in.cc build-aux/subst-default-vals.sh | %reldir%/$(octave_dirstamp) - $(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-default-vals.sh) +%reldir%/$(host_triplet)-octave-config.cc: %reldir%/octave-config.in.cc build-aux/subst-config-vals.sh | %reldir%/$(octave_dirstamp) + $(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-config-vals.sh) src-mostlyclean-local: -rm -f $(OCTAVE_CROSS_TOOLS) @@ -196,14 +196,14 @@ endif -%reldir%/octave-config.cc: %reldir%/octave-config.in.cc build-aux/subst-default-vals.sh | %reldir%/$(octave_dirstamp) - $(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-default-vals.sh) +%reldir%/octave-config.cc: %reldir%/octave-config.in.cc build-aux/subst-config-vals.sh | %reldir%/$(octave_dirstamp) + $(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-config-vals.sh) %reldir%/mkoctfile.cc: %reldir%/mkoctfile.in.cc build-aux/subst-config-vals.sh | %reldir%/$(octave_dirstamp) $(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-config-vals.sh) -%reldir%/main.cc: %reldir%/main.in.cc build-aux/subst-default-vals.sh | %reldir%/$(octave_dirstamp) - $(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-default-vals.sh) +%reldir%/main.cc: %reldir%/main.in.cc build-aux/subst-config-vals.sh | %reldir%/$(octave_dirstamp) + $(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-config-vals.sh) %reldir%/octave-build-info.cc: %reldir%/octave-build-info.in.cc HG-ID | %reldir%/$(octave_dirstamp) $(AM_V_GEN)$(build-info-commands)