Mercurial > hg > octave-nkf
changeset 6319:e7e7c338bf99
[project @ 2007-02-16 11:14:44 by jwe]
author | jwe |
---|---|
date | Fri, 16 Feb 2007 11:14:44 +0000 |
parents | bae85c1e0e2a |
children | 6338017166e4 |
files | ChangeLog mkoctfile.in octave-config.in |
diffstat | 3 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-02-16 John W. Eaton <jwe@octave.org> + + * mkoctfile.in: Use OCTAVE_PREFIX, not OCTAVE_CONF_PREFIX, in sed + substitutions. + * octave-conf.in: Define DATAROOTDIR, not DATADIR, from + OCTAVE_DATAROOTDIR. + From Michael Goffioul <michael.goffioul@swing.be>. + 2007-02-15 John W. Eaton <jwe@octave.org> * octave-config.in (DATAROOTDIR): Include in list of vars.
--- a/mkoctfile.in +++ b/mkoctfile.in @@ -17,9 +17,9 @@ DEFAULT_OCTLIBDIR=%OCTAVE_CONF_OCTLIBDIR% if [ -n "$OCTAVE_HOME" ]; then - DEFAULT_OCTINCLUDEDIR="`echo $DEFAULT_OCTINCLUDEDIR | $SED "s,^$OCTAVE_CONF_PREFIX,$OCTAVE_HOME,"`" - DEFAULT_INCLUDEDIR="`echo $DEFAULT_INCLUDEDIR | $SED "s,^$OCTAVE_CONF_PREFIX,$OCTAVE_HOME,"`" - DEFAULT_OCTLIBDIR="`echo $DEFAULT_OCTLIBDIR | $SED "s,^$OCTAVE_CONF_PREFIX,$OCTAVE_HOME,"`" + DEFAULT_OCTINCLUDEDIR="`echo $DEFAULT_OCTINCLUDEDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" + DEFAULT_INCLUDEDIR="`echo $DEFAULT_INCLUDEDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" + DEFAULT_OCTLIBDIR="`echo $DEFAULT_OCTLIBDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" fi : ${OCTINCLUDEDIR=$DEFAULT_OCTINCLUDEDIR}