Mercurial > hg > octave-max
changeset 5847:62e7b9307d00
[project @ 2006-06-08 14:28:07 by jwe]
| author | jwe |
|---|---|
| date | Thu, 08 Jun 2006 14:28:07 +0000 |
| parents | db0598f94c0f |
| children | 415ae81d331b |
| files | ChangeLog Makeconf.in src/ChangeLog src/defaults.h.in src/toplev.cc |
| diffstat | 5 files changed, 16 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-06-08 John W. Eaton <jwe@octave.org> + + * Makeconf.in (do-subst-default-vals): Also substitute + OCTAVE_DATAROOTDIR. + 2006-06-06 John W. Eaton <jwe@octave.org> * Makeconf.in (datarootdir): New variable.
--- a/Makeconf.in +++ b/Makeconf.in @@ -501,6 +501,7 @@ -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_DEFAULT_PAGER%|\"${DEFAULT_PAGER}\"|" \ -e "s|%OCTAVE_EXEC_PREFIX%|\"${exec_prefix}\"|" \ -e "s|%OCTAVE_FCNFILEDIR%|\"${fcnfiledir}\"|" \
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-06-08 John W. Eaton <jwe@octave.org> + + * defaults.h.in (OCTAVE_DATAROOTDIR): Substitute here. + * toplev.cc (octave_config_info): Add datarootdir to the struct. + 2006-06-07 John W. Eaton <jwe@octave.org> * ov-cell.cc (octave_cell::subsasgn): Handle c-s list object on
--- a/src/defaults.h.in +++ b/src/defaults.h.in @@ -49,6 +49,10 @@ #define OCTAVE_DATADIR %OCTAVE_DATADIR% #endif +#ifndef OCTAVE_DATAROOTDIR +#define OCTAVE_DATAROOTDIR %OCTAVE_DATAROOTDIR% +#endif + #ifndef OCTAVE_EXEC_PREFIX #define OCTAVE_EXEC_PREFIX %OCTAVE_EXEC_PREFIX% #endif
--- a/src/toplev.cc +++ b/src/toplev.cc @@ -787,6 +787,7 @@ "canonical_host_type", OCTAVE_CANONICAL_HOST_TYPE, "config_opts", OCTAVE_CONF_config_opts, "datadir", OCTAVE_DATADIR, + "datarootdir", OCTAVE_DATAROOTDIR, "exec_prefix", OCTAVE_EXEC_PREFIX, "fcnfiledir", OCTAVE_FCNFILEDIR, "imagedir", OCTAVE_IMAGEDIR,