Mercurial > hg > octave-nkf
diff src/defaults.h.in @ 5814:67bf9b4f2ae2
[project @ 2006-05-11 21:58:34 by jwe]
| author | jwe |
|---|---|
| date | Thu, 11 May 2006 21:58:34 +0000 |
| parents | 1138ced03f14 |
| children | 5e41e06f6a78 |
line wrap: on
line diff
--- a/src/defaults.h.in +++ b/src/defaults.h.in @@ -57,18 +57,10 @@ #define OCTAVE_FCNFILEDIR %OCTAVE_FCNFILEDIR% #endif -#ifndef OCTAVE_FCNFILEPATH -#define OCTAVE_FCNFILEPATH %OCTAVE_FCNFILEPATH% -#endif - #ifndef OCTAVE_IMAGEDIR #define OCTAVE_IMAGEDIR %OCTAVE_IMAGEDIR% #endif -#ifndef OCTAVE_IMAGEPATH -#define OCTAVE_IMAGEPATH %OCTAVE_IMAGEPATH% -#endif - #ifndef OCTAVE_INCLUDEDIR #define OCTAVE_INCLUDEDIR %OCTAVE_INCLUDEDIR% #endif @@ -109,18 +101,10 @@ #define OCTAVE_LOCALFCNFILEDIR %OCTAVE_LOCALFCNFILEDIR% #endif -#ifndef OCTAVE_LOCALFCNFILEPATH -#define OCTAVE_LOCALFCNFILEPATH %OCTAVE_LOCALFCNFILEPATH% -#endif - #ifndef OCTAVE_LOCALOCTFILEDIR #define OCTAVE_LOCALOCTFILEDIR %OCTAVE_LOCALOCTFILEDIR% #endif -#ifndef OCTAVE_LOCALOCTFILEPATH -#define OCTAVE_LOCALOCTFILEPATH %OCTAVE_LOCALOCTFILEPATH% -#endif - #ifndef OCTAVE_LOCALSTARTUPFILEDIR #define OCTAVE_LOCALSTARTUPFILEDIR %OCTAVE_LOCALSTARTUPFILEDIR% #endif @@ -182,8 +166,19 @@ extern std::string Varch_lib_dir; extern std::string Vlocal_arch_lib_dir; extern std::string Vlocal_ver_arch_lib_dir; + +extern std::string Vlocal_ver_oct_file_dir; +extern std::string Vlocal_api_oct_file_dir; +extern std::string Vlocal_oct_file_dir; + +extern std::string Vlocal_ver_fcn_file_dir; +extern std::string Vlocal_api_fcn_file_dir; +extern std::string Vlocal_fcn_file_dir; + +extern std::string Voct_file_dir; extern std::string Vfcn_file_dir; -extern std::string Voct_file_dir; + +extern std::string Vimage_dir; // And the cached directory path corresponding to Vload_path. extern dir_path Vload_path_dir_path; @@ -203,6 +198,10 @@ extern void install_defaults (void); +extern void set_exec_path (const std::string& path = std::string ()); +extern void set_load_path (const std::string& path = std::string ()); +extern void set_image_path (const std::string& path = std::string ()); + #endif /*