# HG changeset patch
# User jwe
# Date 1171624484 0
# Node ID e7e7c338bf996a0716d7b1531856edbe759e4c67
# Parent  bae85c1e0e2ad2f1dc5befef1550f210259d0060
[project @ 2007-02-16 11:14:44 by jwe]

diff -r bae85c1e0e2a -r e7e7c338bf99 ChangeLog
--- a/ChangeLog	Fri Feb 16 08:15:25 2007 +0000
+++ b/ChangeLog	Fri Feb 16 11:14:44 2007 +0000
@@ -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.
diff -r bae85c1e0e2a -r e7e7c338bf99 mkoctfile.in
--- a/mkoctfile.in	Fri Feb 16 08:15:25 2007 +0000
+++ b/mkoctfile.in	Fri Feb 16 11:14:44 2007 +0000
@@ -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}
diff -r bae85c1e0e2a -r e7e7c338bf99 octave-config.in
--- a/octave-config.in	Fri Feb 16 08:15:25 2007 +0000
+++ b/octave-config.in	Fri Feb 16 11:14:44 2007 +0000
@@ -11,7 +11,7 @@
 ARCHLIBDIR=%OCTAVE_ARCHLIBDIR%
 BINDIR=%OCTAVE_BINDIR%
 DATADIR=%OCTAVE_DATADIR%
-DATADIR=%OCTAVE_DATAROOTDIR%
+DATAROOTDIR=%OCTAVE_DATAROOTDIR%
 EXEC_PREFIX=%OCTAVE_EXEC_PREFIX%
 FCNFILEDIR=%OCTAVE_FCNFILEDIR%
 IMAGEDIR=%OCTAVE_IMAGEDIR%