changeset 1477:774f8fe3798e

[project @ 1995-09-26 05:21:03 by jwe]
author jwe
date Tue, 26 Sep 1995 05:21:03 +0000
parents 20e9c40d10f6
children d23a476a93b8
files src/octave.cc
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/octave.cc	Tue Sep 26 05:15:50 1995 +0000
+++ b/src/octave.cc	Tue Sep 26 05:21:03 1995 +0000
@@ -389,10 +389,15 @@
 
   int verbose = (verbose_flag && ! inhibit_startup_message);
 
-  // Execute commands from the site-wide configuration file.
+  // Execute commands from the site-wide configuration file.  First
+  // from the file $(prefix)/lib/octave/site/m/octaverc (if it exists),
+  // then from the file $(prefix)/lib/octave/$(version)/m/octaverc (if
+  // it exists).
+
+  char *lsd = get_local_site_defaults ();
+  parse_and_execute (lsd, 0, verbose);
 
   char *sd = get_site_defaults ();
-
   parse_and_execute (sd, 0, verbose);
 
   // Try to execute commands from $HOME/.octaverc and ./.octaverc.