diff --git a/lib/master.pike.in b/lib/master.pike.in index 3fc411669b4f2c312b01f3ad6b3a3d9d4ec9478e..0a78ba95e6b4e724caa2780e1f9cc9bd26f562fa 100644 --- a/lib/master.pike.in +++ b/lib/master.pike.in @@ -1,4 +1,4 @@ -/* $Id: master.pike.in,v 1.9 1998/04/16 02:13:09 hubbe Exp $ +/* $Id: master.pike.in,v 1.10 1998/04/17 21:29:11 mirar Exp $ * * Master-file for Pike. * @@ -508,19 +508,23 @@ void _main(string *orig_argv, string *env) _master_file_name=backtrace()[-1][0]; q=explode_path(_master_file_name); - pike_library_path = combine_path_with_cwd(q[0..sizeof(q)-2] * "/"); + // add path for architecture-shared files + add_include_path("�data_prefix�/pike/include"); + add_module_path("�data_prefix�/pike/modules"); + + // add path for architecture-dependant files + add_include_path("�lib_prefix�/include"); + add_module_path("�lib_prefix�/modules"); + + // add path for wherever the master is now add_include_path(pike_library_path+"/include"); add_module_path(pike_library_path+"/modules"); - a = replace(pike_library_path+"/", "/lib/", "/share/"); - if (a != pike_library_path+"/") { - array st; - if ((st = file_stat(a)) && (sizeof(st)) && (st[1] == -2)) { - add_include_path(a+"/include"); - add_module_path(a+"/modules"); - } - } + pike_library_path = combine_path_with_cwd(q[0..sizeof(q)-2] * "/"); + + add_include_path(pike_library_path+"/include"); + add_module_path(pike_library_path+"/modules"); add_program_path(getcwd()); add_module_path(getcwd()); diff --git a/src/Makefile.in b/src/Makefile.in index 518621d4bf9ba5a6fb42c62f1304dcc2a03158f0..cbbf323f0345f0ae2d0968153fd3406be62f048d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,5 +1,5 @@ # -# $Id: Makefile.in,v 1.75 1998/04/16 01:25:30 hubbe Exp $ +# $Id: Makefile.in,v 1.76 1998/04/17 21:15:02 mirar Exp $ # # This line is needed on some machines. @@ -25,7 +25,7 @@ TMP_LIBDIR = $(TMP_BUILDDIR)/lib prefix = @prefix@ exec_prefix = $(prefix)/bin lib_prefix = $(prefix)/lib/pike -share_prefix = $(prefix)/share/pike +share_prefix = @datadir@ # # use bison please, yacc isn't good enough.