Mercurial > octave-nkf
changeset 5909:a6a2423a9c25
[project @ 2006-07-27 19:35:22 by jwe]
| author | jwe |
|---|---|
| date | Thu, 27 Jul 2006 19:35:22 +0000 |
| parents | 9c134531c2c4 |
| children | 101d966c8d6b |
| files | ChangeLog Makeconf.in configure.in octave-config.in src/ChangeLog src/defaults.cc src/defaults.h.in src/toplev.cc |
| diffstat | 8 files changed, 93 insertions(+), 59 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jul 27 17:16:14 2006 +0000 +++ b/ChangeLog Thu Jul 27 19:35:22 2006 +0000 @@ -1,3 +1,16 @@ +2006-07-27 John W. Eaton <jwe@octave.org> + + * 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 <thomas.weber.mail@gmail.com> + + * octave-config.in (OCTAVE_FCNFILEPATH, OCTAVE_IMAGEPATH, + OCTAVE_LOCALFCNFILEPATH, OCTAVE_LOCALOCTFILEPATH): Delete variables. + 2006-07-26 John W. Eaton <jwe@octave.org> * mkoctfile.in (Options): Accept -g.
--- a/Makeconf.in Thu Jul 27 17:16:14 2006 +0000 +++ b/Makeconf.in Thu Jul 27 19:35:22 2006 +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}\"|" \
--- a/configure.in Thu Jul 27 17:16:14 2006 +0000 +++ b/configure.in Thu Jul 27 19:35:22 2006 +0000 @@ -29,7 +29,7 @@ EXTERN_CXXFLAGS="$CXXFLAGS" AC_INIT -AC_REVISION($Revision: 1.516 $) +AC_REVISION($Revision: 1.517 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -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,
--- a/octave-config.in Thu Jul 27 17:16:14 2006 +0000 +++ b/octave-config.in Thu Jul 27 19:35:22 2006 +0000 @@ -5,43 +5,40 @@ # Rafael Laboissiere <rafael@laboissiere.net> # 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.
--- a/src/ChangeLog Thu Jul 27 17:16:14 2006 +0000 +++ b/src/ChangeLog Thu Jul 27 19:35:22 2006 +0000 @@ -1,3 +1,12 @@ +2006-07-27 John W. Eaton <jwe@octave.org> + + * 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 <jwe@octave.org> * mex.cc (mxArray::as_octave_value (mxArray *)): New static function.
--- a/src/defaults.cc Thu Jul 27 17:16:14 2006 +0000 +++ b/src/defaults.cc Thu Jul 27 19:35:22 2006 +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,10 +364,10 @@ set_default_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_arch_lib_dir (); - set_default_local_ver_oct_file_dir (); set_default_local_api_oct_file_dir (); set_default_local_oct_file_dir ();
--- a/src/defaults.h.in Thu Jul 27 17:16:14 2006 +0000 +++ b/src/defaults.h.in Thu Jul 27 19:35:22 2006 +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
--- a/src/toplev.cc Thu Jul 27 17:16:14 2006 +0000 +++ b/src/toplev.cc Thu Jul 27 19:35:22 2006 +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,