[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Cleaning up octave-config [patch]
From: |
John W. Eaton |
Subject: |
Cleaning up octave-config [patch] |
Date: |
Thu, 27 Jul 2006 15:35:18 -0400 |
On 9-Jul-2006, Thomas Weber wrote:
| Additionally, is it possible to add a new variable:
| LOCALAPIARCHLIBDIR
| being set to something along
| /usr/lib/octave/site/exec/api-v19/i486-pc-linux-gnu/ ?
|
| Reason for the new variable: if one has two versions of Octave (2.1 and
| 2.9) and wants to have octave-forge for both versions, the files put in
| this directory (aurecord and rasmol.sh) will clash.
OK, I checked in the following change (this patch includes your
changes to octave-config.in).
Thanks,
jwe
ChangeLog
2006-07-27 John W. Eaton <address@hidden>
* Makeconf.in (localapiarchlibdir): Substitute it here.
(do-subst-default-vals): Include it in the sed command here.
* configure.in (localapiarchlibdir): New variable.
* octave-config.in: Don't quote %VAR% values.
(LOCALAPIARCHLIBDIR): New variable.
2006-07-27 Thomas Weber <address@hidden>
* octave-config.in (OCTAVE_FCNFILEPATH, OCTAVE_IMAGEPATH,
OCTAVE_LOCALFCNFILEPATH, OCTAVE_LOCALOCTFILEPATH): Delete variables.
Index: Makeconf.in
===================================================================
RCS file: /cvs/octave/Makeconf.in,v
retrieving revision 1.173
diff -u -u -r1.173 Makeconf.in
--- Makeconf.in 8 Jun 2006 14:28:07 -0000 1.173
+++ Makeconf.in 27 Jul 2006 19:33:05 -0000
@@ -300,6 +300,7 @@
# Where to put executables to be run by Octave rather than by the
# user that are specific to this site.
localarchlibdir = @localarchlibdir@
+localapiarchlibdir = @localapiarchlibdir@
localverarchlibdir = @localverarchlibdir@
# Where to put object files that will by dynamically loaded.
@@ -517,6 +518,7 @@
-e "s|%OCTAVE_LOCALFCNFILEDIR%|\"${localfcnfiledir}\"|" \
-e "s|%OCTAVE_LOCALOCTFILEDIR%|\"${localoctfiledir}\"|" \
-e "s|%OCTAVE_LOCALSTARTUPFILEDIR%|\"${localstartupfiledir}\"|" \
+ -e "s|%OCTAVE_LOCALAPIARCHLIBDIR%|\"${localapiarchlibdir}\"|" \
-e "s|%OCTAVE_LOCALVERARCHLIBDIR%|\"${localverarchlibdir}\"|" \
-e "s|%OCTAVE_LOCALVERFCNFILEDIR%|\"${localverfcnfiledir}\"|" \
-e "s|%OCTAVE_LOCALVEROCTFILEDIR%|\"${localveroctfiledir}\"|" \
Index: configure.in
===================================================================
RCS file: /cvs/octave/configure.in,v
retrieving revision 1.516
diff -u -u -r1.516 configure.in
--- configure.in 26 Jul 2006 17:19:10 -0000 1.516
+++ configure.in 27 Jul 2006 19:33:06 -0000
@@ -84,6 +84,8 @@
'$(libexecdir)/octave/$(version)/exec/$(canonical_host_type)')
OCTAVE_SET_DEFAULT(localarchlibdir,
'$(libexecdir)/octave/site/exec/$(canonical_host_type)')
+OCTAVE_SET_DEFAULT(localapiarchlibdir,
+ '$(libexecdir)/octave/$(api_version)/site/exec/$(canonical_host_type)')
OCTAVE_SET_DEFAULT(localverarchlibdir,
'$(libexecdir)/octave/$(version)/site/exec/$(canonical_host_type)')
OCTAVE_SET_DEFAULT(octfiledir,
Index: octave-config.in
===================================================================
RCS file: /cvs/octave/octave-config.in,v
retrieving revision 1.6
diff -u -u -r1.6 octave-config.in
--- octave-config.in 26 Nov 2003 14:42:52 -0000 1.6
+++ octave-config.in 27 Jul 2006 19:33:06 -0000
@@ -5,43 +5,40 @@
# Rafael Laboissiere <address@hidden>
# This script is in the public domain
-API_VERSION="%OCTAVE_API_VERSION%"
-CANONICAL_HOST_TYPE="%OCTAVE_CANONICAL_HOST_TYPE%"
-DEFAULT_PAGER="%OCTAVE_DEFAULT_PAGER%"
-ARCHLIBDIR="%OCTAVE_ARCHLIBDIR%"
-BINDIR="%OCTAVE_BINDIR%"
-DATADIR="%OCTAVE_DATADIR%"
-EXEC_PREFIX="%OCTAVE_EXEC_PREFIX%"
-FCNFILEDIR="%OCTAVE_FCNFILEDIR%"
-FCNFILEPATH="%OCTAVE_FCNFILEPATH%"
-IMAGEDIR="%OCTAVE_IMAGEDIR%"
-IMAGEPATH="%OCTAVE_IMAGEPATH%"
-INCLUDEDIR="%OCTAVE_INCLUDEDIR%"
-INFODIR="%OCTAVE_INFODIR%"
-INFOFILE="%OCTAVE_INFOFILE%"
-LIBDIR="%OCTAVE_LIBDIR%"
-LIBEXECDIR="%OCTAVE_LIBEXECDIR%"
-LIBEXECDIR="%OCTAVE_LIBEXECDIR%"
-LOCALAPIFCNFILEDIR="%OCTAVE_LOCALAPIFCNFILEDIR%"
-LOCALAPIOCTFILEDIR="%OCTAVE_LOCALAPIOCTFILEDIR%"
-LOCALARCHLIBDIR="%OCTAVE_LOCALARCHLIBDIR%"
-LOCALFCNFILEDIR="%OCTAVE_LOCALFCNFILEDIR%"
-LOCALFCNFILEPATH="%OCTAVE_LOCALFCNFILEPATH%"
-LOCALOCTFILEDIR="%OCTAVE_LOCALOCTFILEDIR%"
-LOCALOCTFILEPATH="%OCTAVE_LOCALOCTFILEPATH%"
-LOCALSTARTUPFILEDIR="%OCTAVE_LOCALSTARTUPFILEDIR%"
-LOCALVERARCHLIBDIR="%OCTAVE_LOCALVERARCHLIBDIR%"
-LOCALVERFCNFILEDIR="%OCTAVE_LOCALVERFCNFILEDIR%"
-LOCALVEROCTFILEDIR="%OCTAVE_LOCALVEROCTFILEDIR%"
-MAN1DIR="%OCTAVE_MAN1DIR%"
-MAN1EXT="%OCTAVE_MAN1EXT%"
-MANDIR="%OCTAVE_MANDIR%"
-OCTFILEDIR="%OCTAVE_OCTFILEDIR%"
-OCTINCLUDEDIR="%OCTAVE_OCTINCLUDEDIR%"
-OCTLIBDIR="%OCTAVE_OCTLIBDIR%"
-PREFIX="%OCTAVE_PREFIX%"
-STARTUPFILEDIR="%OCTAVE_STARTUPFILEDIR%"
-VERSION="%OCTAVE_VERSION%"
+API_VERSION=%OCTAVE_API_VERSION%
+CANONICAL_HOST_TYPE=%OCTAVE_CANONICAL_HOST_TYPE%
+DEFAULT_PAGER=%OCTAVE_DEFAULT_PAGER%
+ARCHLIBDIR=%OCTAVE_ARCHLIBDIR%
+BINDIR=%OCTAVE_BINDIR%
+DATADIR=%OCTAVE_DATADIR%
+EXEC_PREFIX=%OCTAVE_EXEC_PREFIX%
+FCNFILEDIR=%OCTAVE_FCNFILEDIR%
+IMAGEDIR=%OCTAVE_IMAGEDIR%
+INCLUDEDIR=%OCTAVE_INCLUDEDIR%
+INFODIR=%OCTAVE_INFODIR%
+INFOFILE=%OCTAVE_INFOFILE%
+LIBDIR=%OCTAVE_LIBDIR%
+LIBEXECDIR=%OCTAVE_LIBEXECDIR%
+LIBEXECDIR=%OCTAVE_LIBEXECDIR%
+LOCALAPIARCHLIBDIR=%OCTAVE_LOCALAPIARCHLIBDIR%
+LOCALAPIFCNFILEDIR=%OCTAVE_LOCALAPIFCNFILEDIR%
+LOCALAPIOCTFILEDIR=%OCTAVE_LOCALAPIOCTFILEDIR%
+LOCALARCHLIBDIR=%OCTAVE_LOCALARCHLIBDIR%
+LOCALFCNFILEDIR=%OCTAVE_LOCALFCNFILEDIR%
+LOCALOCTFILEDIR=%OCTAVE_LOCALOCTFILEDIR%
+LOCALSTARTUPFILEDIR=%OCTAVE_LOCALSTARTUPFILEDIR%
+LOCALVERARCHLIBDIR=%OCTAVE_LOCALVERARCHLIBDIR%
+LOCALVERFCNFILEDIR=%OCTAVE_LOCALVERFCNFILEDIR%
+LOCALVEROCTFILEDIR=%OCTAVE_LOCALVEROCTFILEDIR%
+MAN1DIR=%OCTAVE_MAN1DIR%
+MAN1EXT=%OCTAVE_MAN1EXT%
+MANDIR=%OCTAVE_MANDIR%
+OCTFILEDIR=%OCTAVE_OCTFILEDIR%
+OCTINCLUDEDIR=%OCTAVE_OCTINCLUDEDIR%
+OCTLIBDIR=%OCTAVE_OCTLIBDIR%
+PREFIX=%OCTAVE_PREFIX%
+STARTUPFILEDIR=%OCTAVE_STARTUPFILEDIR%
+VERSION=%OCTAVE_VERSION%
usage_msg="usage: octave-config [options]"
@@ -70,25 +67,23 @@
-p VAR, --print VAR Print the value of the given configuration
variable VAR. Recognized variables are:
- API_VERSION LOCALARCHLIBDIR
- CANONICAL_HOST_TYPE LOCALFCNFILEDIR
- DEFAULT_PAGER LOCALFCNFILEPATH
- ARCHLIBDIR LOCALOCTFILEDIR
- BINDIR LOCALOCTFILEPATH
- DATADIR LOCALSTARTUPFILEDIR
- EXEC_PREFIX LOCALVERARCHLIBDIR
- FCNFILEDIR LOCALVERFCNFILEDIR
- FCNFILEPATH LOCALVEROCTFILEDIR
- IMAGEDIR MAN1DIR
- IMAGEPATH MAN1EXT
- INCLUDEDIR MANDIR
- INFODIR OCTFILEDIR
- INFOFILE OCTINCLUDEDIR
- LIBDIR OCTLIBDIR
- LIBEXECDIR PREFIX
- LIBEXECDIR STARTUPFILEDIR
- LOCALAPIFCNFILEDIR VERSION
- LOCALAPIOCTFILEDIR
+ API_VERSION LOCALAPIARCHLIBDIR
+ CANONICAL_HOST_TYPE LOCALAPIFCNFILEDIR
+ DEFAULT_PAGER LOCALAPIOCTFILEDIR
+ ARCHLIBDIR LOCALARCHLIBDIR
+ BINDIR LOCALFCNFILEDIR
+ DATADIR LOCALOCTFILEDIR
+ EXEC_PREFIX LOCALSTARTUPFILEDIR
+ FCNFILEDIR LOCALVERARCHLIBDIR
+ LOCALVEROCTFILEDIR LOCALVERFCNFILEDIR
+ IMAGEDIR MAN1DIR
+ MAN1EXT MANDIR
+ INCLUDEDIR OCTFILEDIR
+ INFODIR OCTINCLUDEDIR
+ INFOFILE OCTLIBDIR
+ LIBDIR PREFIX
+ LIBEXECDIR STARTUPFILEDIR
+ LIBEXECDIR VERSION
-v, --version Print the Octave version number.
Index: src/ChangeLog
===================================================================
RCS file: /cvs/octave/src/ChangeLog,v
retrieving revision 1.1485
diff -u -u -r1.1485 ChangeLog
--- src/ChangeLog 27 Jul 2006 03:21:02 -0000 1.1485
+++ src/ChangeLog 27 Jul 2006 19:33:09 -0000
@@ -1,3 +1,12 @@
+2006-07-27 John W. Eaton <address@hidden>
+
+ * defaults.cc (Vlocal_api_arch_lib_dir): New variable.
+ (set_default_local_api_arch_lib_dir): New function.
+ (install_defaults): Call it.
+ (set_exec_path): Put Vlocal_api_arch_lib_dir in the list.
+ * toplev.cc (localapiarchlibdir): Include it in the list.
+ * defaults.h.in (OCTAVE_LOCALAPIARCHLIBDIR): Substitute here.
+
2006-07-26 John W. Eaton <address@hidden>
* mex.cc (mxArray::as_octave_value (mxArray *)): New static function.
Index: src/defaults.cc
===================================================================
RCS file: /cvs/octave/src/defaults.cc,v
retrieving revision 1.60
diff -u -u -r1.60 defaults.cc
--- src/defaults.cc 26 May 2006 21:41:32 -0000 1.60
+++ src/defaults.cc 27 Jul 2006 19:33:09 -0000
@@ -67,6 +67,7 @@
std::string Vlibexec_dir;
std::string Varch_lib_dir;
std::string Vlocal_arch_lib_dir;
+std::string Vlocal_api_arch_lib_dir;
std::string Vlocal_ver_arch_lib_dir;
std::string Vlocal_ver_oct_file_dir;
@@ -159,6 +160,12 @@
}
static void
+set_default_local_api_arch_lib_dir (void)
+{
+ Vlocal_api_arch_lib_dir = subst_octave_home (OCTAVE_LOCALAPIARCHLIBDIR);
+}
+
+static void
set_default_local_ver_arch_lib_dir (void)
{
Vlocal_ver_arch_lib_dir = subst_octave_home (OCTAVE_LOCALVERARCHLIBDIR);
@@ -228,6 +235,7 @@
set_exec_path (const std::string& path)
{
VEXEC_PATH = Vlocal_ver_arch_lib_dir + dir_path::path_sep_str
+ + Vlocal_api_arch_lib_dir + dir_path::path_sep_str
+ Vlocal_arch_lib_dir + dir_path::path_sep_str
+ Varch_lib_dir + dir_path::path_sep_str
+ Vbin_dir;
@@ -356,9 +364,9 @@
set_default_arch_lib_dir ();
- set_default_local_arch_lib_dir ();
-
set_default_local_ver_arch_lib_dir ();
+ set_default_local_api_arch_lib_dir ();
+ set_default_local_arch_lib_dir ();
set_default_local_ver_oct_file_dir ();
set_default_local_api_oct_file_dir ();
Index: src/defaults.h.in
===================================================================
RCS file: /cvs/octave/src/defaults.h.in,v
retrieving revision 1.39
diff -u -u -r1.39 defaults.h.in
--- src/defaults.h.in 8 Jun 2006 14:28:07 -0000 1.39
+++ src/defaults.h.in 27 Jul 2006 19:33:09 -0000
@@ -113,6 +113,10 @@
#define OCTAVE_LOCALSTARTUPFILEDIR %OCTAVE_LOCALSTARTUPFILEDIR%
#endif
+#ifndef OCTAVE_LOCALAPIARCHLIBDIR
+#define OCTAVE_LOCALAPIARCHLIBDIR %OCTAVE_LOCALAPIARCHLIBDIR%
+#endif
+
#ifndef OCTAVE_LOCALVERARCHLIBDIR
#define OCTAVE_LOCALVERARCHLIBDIR %OCTAVE_LOCALVERARCHLIBDIR%
#endif
Index: src/toplev.cc
===================================================================
RCS file: /cvs/octave/src/toplev.cc,v
retrieving revision 1.185
diff -u -u -r1.185 toplev.cc
--- src/toplev.cc 8 Jun 2006 14:28:07 -0000 1.185
+++ src/toplev.cc 27 Jul 2006 19:33:09 -0000
@@ -802,6 +802,7 @@
"localfcnfiledir", OCTAVE_LOCALFCNFILEDIR,
"localoctfiledir", OCTAVE_LOCALOCTFILEDIR,
"localstartupfiledir", OCTAVE_LOCALSTARTUPFILEDIR,
+ "localapiarchlibdir", OCTAVE_LOCALAPIARCHLIBDIR,
"localverarchlibdir", OCTAVE_LOCALVERARCHLIBDIR,
"localverfcnfiledir", OCTAVE_LOCALVERFCNFILEDIR,
"localveroctfiledir", OCTAVE_LOCALVEROCTFILEDIR,