Mercurial > octave-nkf

comparison src/defaults.cc @ 3597:26662775f4e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2000-02-12 02:24:41 by jwe]
author jwe
date Sat, 12 Feb 2000 02:24:46 +0000
parents c5ebcd5d25a9
children 15a0aa0b6c18
comparison
equal deleted inserted replaced
3596:edcaebe1b81b 3597:26662775f4e9
57 std::string Vinfo_dir; 57 std::string Vinfo_dir;
58 std::string Vdata_dir; 58 std::string Vdata_dir;
59 std::string Vlibexec_dir; 59 std::string Vlibexec_dir;
60 std::string Varch_lib_dir; 60 std::string Varch_lib_dir;
61 std::string Vlocal_arch_lib_dir; 61 std::string Vlocal_arch_lib_dir;
62 std::string Vlocal_ver_arch_lib_dir;
62 std::string Vfcn_file_dir; 63 std::string Vfcn_file_dir;
63 64
64 // The path that will be searched for programs that we execute. 65 // The path that will be searched for programs that we execute.
65 // (--exec-path path) 66 // (--exec-path path)
66 std::string Vexec_path; 67 std::string Vexec_path;
143 { 144 {
144 Vlocal_arch_lib_dir = subst_octave_home (OCTAVE_LOCALARCHLIBDIR); 145 Vlocal_arch_lib_dir = subst_octave_home (OCTAVE_LOCALARCHLIBDIR);
145 } 146 }
146 147
147 static void 148 static void
149 set_default_local_ver_arch_lib_dir (void)
150 {
151 Vlocal_ver_arch_lib_dir = subst_octave_home (OCTAVE_LOCALVERARCHLIBDIR);
152 }
153
154 static void
148 set_default_fcn_file_dir (void) 155 set_default_fcn_file_dir (void)
149 { 156 {
150 Vfcn_file_dir = subst_octave_home (OCTAVE_FCNFILEDIR); 157 Vfcn_file_dir = subst_octave_home (OCTAVE_FCNFILEDIR);
151 } 158 }
152 159
280 287
281 set_default_arch_lib_dir (); 288 set_default_arch_lib_dir ();
282 289
283 set_default_local_arch_lib_dir (); 290 set_default_local_arch_lib_dir ();
284 291
292 set_default_local_ver_arch_lib_dir ();
293
285 set_default_fcn_file_dir (); 294 set_default_fcn_file_dir ();
286 295
287 set_default_bin_dir (); 296 set_default_bin_dir ();
288 297
289 set_default_exec_path (); 298 set_default_exec_path ();
333 } 342 }
334 else 343 else
335 { 344 {
336 Vexec_path = s; 345 Vexec_path = s;
337 346
338 std::string std_path = Vlocal_arch_lib_dir + std::string (SEPCHAR_STR) 347 std::string std_path
339 + Varch_lib_dir + std::string (SEPCHAR_STR) + Vbin_dir; 348 = Vlocal_ver_arch_lib_dir + std::string (SEPCHAR_STR)
349 + Vlocal_arch_lib_dir + std::string (SEPCHAR_STR)
350 + Varch_lib_dir + std::string (SEPCHAR_STR)
351 + Vbin_dir;
340 352
341 std::string path; 353 std::string path;
342 354
343 int eplen = Vexec_path.length (); 355 int eplen = Vexec_path.length ();
344 356