Mercurial > octave
changeset 1476:20e9c40d10f6
[project @ 1995-09-26 05:10:29 by jwe]
| author | jwe |
|---|---|
| date | Tue, 26 Sep 1995 05:15:50 +0000 |
| parents | f33cac781a44 |
| children | 774f8fe3798e |
| files | src/Makefile.in src/defaults.h.in src/variables.cc src/variables.h |
| diffstat | 4 files changed, 18 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile.in Tue Sep 26 05:05:20 1995 +0000 +++ b/src/Makefile.in Tue Sep 26 05:15:50 1995 +0000 @@ -216,6 +216,7 @@ -e "s;%OCTAVE_LIBDIR%;\"${libdir}\";" \ -e "s;%OCTAVE_INFODIR%;\"${infodir}\";" \ -e "s;%OCTAVE_FCNFILEDIR%;\"${fcnfiledir}\";" \ + -e "s;%OCTAVE_LOCALFCNFILEDIR%;\"${localfcnfiledir}\";" \ -e "s;%OCTAVE_LOCALFCNFILEPATH%;\"${localfcnfilepath}\";" \ -e "s;%OCTAVE_ARCHLIBDIR%;\"${archlibdir}\";" \ -e "s;%OCTAVE_OCTFILEDIR%;\"${octfiledir}\";" \
--- a/src/defaults.h.in Tue Sep 26 05:05:20 1995 +0000 +++ b/src/defaults.h.in Tue Sep 26 05:15:50 1995 +0000 @@ -56,6 +56,14 @@ #define OCTAVE_FCNFILEDIR %OCTAVE_FCNFILEDIR% #endif +#ifndef OCTAVE_LOCALFCNFILEDIR +#define OCTAVE_LOCALFCNFILEDIR %OCTAVE_LOCALFCNFILEDIR% +#endif + +#ifndef OCTAVE_LOCALSTARTUPFILEDIR +#define OCTAVE_LOCALSTARTUPFILEDIR OCTAVE_LOCALFCNFILEDIR "/startup" +#endif + #ifndef OCTAVE_STARTUPFILEDIR #define OCTAVE_STARTUPFILEDIR OCTAVE_FCNFILEDIR "/startup" #endif
--- a/src/variables.cc Tue Sep 26 05:05:20 1995 +0000 +++ b/src/variables.cc Tue Sep 26 05:15:50 1995 +0000 @@ -496,6 +496,14 @@ } char * +get_local_site_defaults (void) +{ + static char *startupdir = subst_octave_home (OCTAVE_LOCALSTARTUPFILEDIR); + static char *sd = strconcat (startupdir, "/octaverc"); + return sd; +} + +char * get_site_defaults (void) { static char *startupdir = subst_octave_home (OCTAVE_STARTUPFILEDIR);
--- a/src/variables.h Tue Sep 26 05:05:20 1995 +0000 +++ b/src/variables.h Tue Sep 26 05:15:50 1995 +0000 @@ -131,6 +131,7 @@ extern char *default_path (void); extern char *default_info_file (void); extern char *default_editor (void); +extern char *get_local_site_defaults (void); extern char *get_site_defaults (void); // Symbol table for symbols at the top level.