# HG changeset patch # User jwe # Date 812092550 0 # Node ID 20e9c40d10f6d1967f4796e3467ecabe5d162953 # Parent f33cac781a44c50dc45dabe52e488c026ad1a44c [project @ 1995-09-26 05:10:29 by jwe] diff --git a/src/Makefile.in b/src/Makefile.in --- a/src/Makefile.in +++ b/src/Makefile.in @@ -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}\";" \ diff --git a/src/defaults.h.in b/src/defaults.h.in --- a/src/defaults.h.in +++ b/src/defaults.h.in @@ -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 diff --git a/src/variables.cc b/src/variables.cc --- a/src/variables.cc +++ b/src/variables.cc @@ -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); diff --git a/src/variables.h b/src/variables.h --- a/src/variables.h +++ b/src/variables.h @@ -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.