[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: RE: RE: RE: OCTAVE_HOME support in octave_config_info
From: |
John W. Eaton |
Subject: |
RE: RE: RE: RE: OCTAVE_HOME support in octave_config_info |
Date: |
Fri, 16 Feb 2007 04:48:22 -0500 |
On 16-Feb-2007, address@hidden wrote:
| > Will you please make your C++ versions of these scripts do the same?
| > Once you do that, I think we should include those files in the Octave
| > sources, even if they are only built on Windows systems for now.
|
| I'll do it. For the moment, source code is in octave-forge CVS in
| admin/Windows/msvc/.
|
| In the meantime, I noticed 2 problems in your patch:
| 1) octave-config.in: defines DATADIR twice
| 2) mkoctfile.in: defines OCTAVE_PREFIX, but replaces OCTAVE_CONF_PREFIX
I checked in the following patch.
Thanks,
jwe
ChangeLog:
2007-02-16 John W. Eaton <address@hidden>
* 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 <address@hidden>.
Index: octave-config.in
===================================================================
RCS file: /cvs/octave/octave-config.in,v
retrieving revision 1.8
diff -u -u -r1.8 octave-config.in
--- octave-config.in 15 Feb 2007 21:18:34 -0000 1.8
+++ octave-config.in 16 Feb 2007 09:47:53 -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%
Index: mkoctfile.in
===================================================================
RCS file: /cvs/octave/mkoctfile.in,v
retrieving revision 1.56
diff -u -u -r1.56 mkoctfile.in
--- mkoctfile.in 15 Feb 2007 21:18:34 -0000 1.56
+++ mkoctfile.in 16 Feb 2007 09:47:53 -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}