changeset 731:9b930afbf477

[project @ 1994-09-22 19:27:48 by jwe]
author jwe
date Thu, 22 Sep 1994 19:29:29 +0000
parents 75c986b14c06
children a8e00973fcd4
files scripts/Makefile.in src/variables.cc
diffstat 2 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -25,7 +25,8 @@
 DISTFILES = Makefile.in $(SOURCES)
 
 SUBDIRS = control elfun general image linear-algebra miscellaneous \
-	plot polynomial set signal specfun special-matrix statistics
+	plot polynomial set signal specfun special-matrix startup \
+	statistics
 
 DISTSUBDIRS = $(SUBDIRS)
 
--- a/src/variables.cc
+++ b/src/variables.cc
@@ -445,10 +445,8 @@
 char *
 get_site_defaults (void)
 {
-  static char *sd = 0;
-  delete [] sd;
-  char *libdir = octave_lib_dir ();
-  sd = strconcat (libdir, "/octaverc");
+  static char *startupdir = subst_octave_home (OCTAVE_STARTUPFILEDIR);
+  static char *sd = strconcat (startupdir, "/octaverc");
   return sd;
 }