Mercurial > octave-nkf
changeset 3591:b35c6af4c49c
[project @ 2000-02-08 19:19:17 by jwe]
| author | jwe |
|---|---|
| date | Tue, 08 Feb 2000 19:19:19 +0000 |
| parents | a31ee5c3b66c |
| children | 0bf30dac04b2 |
| files | ChangeLog Makeconf.in mkoctfile.in src/ChangeLog src/oct-conf.h.in src/toplev.cc |
| diffstat | 6 files changed, 18 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Feb 08 10:09:06 2000 +0000 +++ b/ChangeLog Tue Feb 08 19:19:19 2000 +0000 @@ -1,5 +1,8 @@ 2000-02-08 John W. Eaton <jwe@bevo.che.wisc.edu> + * Makeconf.in (MKOCTFILE_INCFLAGS): New macro. + (do-subst-conf-vals): Substitute it. + * mkoctfile.in: Fix names in substititions. * octave-bug.in: Likewise.
--- a/Makeconf.in Tue Feb 08 10:09:06 2000 +0000 +++ b/Makeconf.in Tue Feb 08 19:19:19 2000 +0000 @@ -252,6 +252,9 @@ # The type of computer we are running on. canonical_host_type = @canonical_host_type@ +# The -I flags to use for the mkoctfile script. +MKOCTFILE_INCFLAGS = -I$(octincludedir) -I$(includedir) + # The following pattern rules and the substitution functions require # GNU make. If you don't have it, get it! @@ -361,6 +364,7 @@ -e "s;%OCTAVE_CONF_LIBREADLINE%;\"${LIBREADLINE}\";" \ -e "s;%OCTAVE_CONF_LIBS%;\"${LIBS}\";" \ -e "s;%OCTAVE_CONF_LN_S%;\"${LN_S}\";" \ + -e "s;%OCTAVE_CONF_MKOCTFILE_INCFLAGS%;\"${MKOCTFILE_INCFLAGS}\";" \ -e "s;%OCTAVE_CONF_OCTAVE_LITE%;\"${OCTAVE_LITE}\";" \ -e "s;%OCTAVE_CONF_RANLIB%;\"${RANLIB}\";" \ -e "s;%OCTAVE_CONF_RDYNAMIC_FLAG%;\"${RDYNAMIC_FLAG}\";" \
--- a/mkoctfile.in Tue Feb 08 10:09:06 2000 +0000 +++ b/mkoctfile.in Tue Feb 08 19:19:19 2000 +0000 @@ -11,7 +11,7 @@ # compiled. : ${CPPFLAGS=%OCTAVE_CONF_CPPFLAGS%} -: ${INCFLAGS=%OCTAVE_CONF_INCFLAGS%} +: ${INCFLAGS=%OCTAVE_CONF_MKOCTFILE_INCFLAGS%} : ${F77=%OCTAVE_CONF_F77%} : ${FFLAGS=%OCTAVE_CONF_FFLAGS%} : ${FPICFLAG=%OCTAVE_CONF_FPICFLAG%}
--- a/src/ChangeLog Tue Feb 08 10:09:06 2000 +0000 +++ b/src/ChangeLog Tue Feb 08 19:19:19 2000 +0000 @@ -1,3 +1,8 @@ +2000-02-08 John W. Eaton <jwe@bevo.che.wisc.edu> + + * toplev.cc (octave_config_info): Add MKOCTFILE_INCFLAGS to the struct. + * oct-conf.h.in (OCTAVE_CONF_MKOCTFILE_INCFLAGS): Define. + 2000-02-07 John W. Eaton <jwe@bevo.che.wisc.edu> * DLD-FUNCTIONS/balance.cc (Fbalance): Explicitly request
--- a/src/oct-conf.h.in Tue Feb 08 10:09:06 2000 +0000 +++ b/src/oct-conf.h.in Tue Feb 08 19:19:19 2000 +0000 @@ -212,6 +212,10 @@ #define OCTAVE_CONF_LN_S %OCTAVE_CONF_LN_S% #endif +#ifndef OCTAVE_CONF_MKOCTFILE_INCFLAGS +#define OCTAVE_CONF_MKOCTFILE_INCFLAGS %OCTAVE_CONF_MKOCTFILE_INCFLAGS% +#endif + #ifndef OCTAVE_CONF_OCTAVE_LITE #define OCTAVE_CONF_OCTAVE_LITE %OCTAVE_CONF_OCTAVE_LITE% #endif
--- a/src/toplev.cc Tue Feb 08 10:09:06 2000 +0000 +++ b/src/toplev.cc Tue Feb 08 19:19:19 2000 +0000 @@ -652,6 +652,7 @@ m ["LIBREADLINE"] = OCTAVE_CONF_LIBREADLINE; m ["LIBS"] = OCTAVE_CONF_LIBS; m ["LN_S"] = OCTAVE_CONF_LN_S; + m ["MKOCTFILE_INCFLAGS"] = OCTAVE_CONF_MKOCTFILE_INCFLAGS; m ["OCTAVE_LITE"] = OCTAVE_CONF_OCTAVE_LITE; m ["RANLIB"] = OCTAVE_CONF_RANLIB; m ["RDYNAMIC_FLAG"] = OCTAVE_CONF_RDYNAMIC_FLAG;