Mercurial > hg > octave-nkf

comparison src/interpfcn/defaults.cc @ 15157:a87fa9132b72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
provide Voct_etc_dir variable * defaults.cc (Voct_etc_dir): New global variable. (set_default_oct_etc_dir): New function. (install_defaults): Call it. * defaults.in.h (Voct_etc_dir): Provide decl.
author John W. Eaton <jwe@octave.org>
date Sat, 11 Aug 2012 17:32:42 -0400
parents 60ff2cef569d
children
comparison
equal deleted inserted replaced
15153:ba431d1106e3 15157:a87fa9132b72
72 72
73 std::string Vlocal_ver_fcn_file_dir; 73 std::string Vlocal_ver_fcn_file_dir;
74 std::string Vlocal_api_fcn_file_dir; 74 std::string Vlocal_api_fcn_file_dir;
75 std::string Vlocal_fcn_file_dir; 75 std::string Vlocal_fcn_file_dir;
76 76
77 std::string Voct_etc_dir;
78
77 std::string Voct_file_dir; 79 std::string Voct_file_dir;
78 std::string Vfcn_file_dir; 80 std::string Vfcn_file_dir;
79 81
80 std::string Vimage_dir; 82 std::string Vimage_dir;
81 83
209 211
210 static void 212 static void
211 set_default_image_dir (void) 213 set_default_image_dir (void)
212 { 214 {
213 Vimage_dir = subst_octave_home (OCTAVE_IMAGEDIR); 215 Vimage_dir = subst_octave_home (OCTAVE_IMAGEDIR);
216 }
217
218 static void
219 set_default_oct_etc_dir (void)
220 {
221 Voct_etc_dir = subst_octave_home (OCTAVE_OCTETCDIR);
214 } 222 }
215 223
216 static void 224 static void
217 set_default_oct_file_dir (void) 225 set_default_oct_file_dir (void)
218 { 226 {
387 set_default_local_oct_file_dir (); 395 set_default_local_oct_file_dir ();
388 396
389 set_default_local_ver_fcn_file_dir (); 397 set_default_local_ver_fcn_file_dir ();
390 set_default_local_api_fcn_file_dir (); 398 set_default_local_api_fcn_file_dir ();
391 set_default_local_fcn_file_dir (); 399 set_default_local_fcn_file_dir ();
400
401 set_default_oct_etc_dir ();
392 402
393 set_default_fcn_file_dir (); 403 set_default_fcn_file_dir ();
394 set_default_oct_file_dir (); 404 set_default_oct_file_dir ();
395 405
396 set_default_image_dir (); 406 set_default_image_dir ();