diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2012-06-30 05:23:17 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2012-06-30 05:23:17 +0400 |
| commit | fd07f07e280e1ef112fc5b1ee26a2ffb477cdf5c (patch) | |
| tree | 4a53de869fa6c071bde29fa87ff8d03a8450e303 | |
| parent | 00febeb5ed49a2a0121ad1144da2cb131e680ecd (diff) | |
| download | sunmake-fd07f07e280e1ef112fc5b1ee26a2ffb477cdf5c.tar.gz | |
Compilable on linux
| -rw-r--r-- | usr/src/make_src/Make/bin/make/common/read.cc | 50 |
1 files changed, 2 insertions, 48 deletions
diff --git a/usr/src/make_src/Make/bin/make/common/read.cc b/usr/src/make_src/Make/bin/make/common/read.cc index 74bccfd..2841a97 100644 --- a/usr/src/make_src/Make/bin/make/common/read.cc +++ b/usr/src/make_src/Make/bin/make/common/read.cc @@ -47,11 +47,6 @@ #include <sys/uio.h> /* read() */ #include <unistd.h> /* read(), unlink() */ -#if defined(HP_UX) || defined(linux) -#include <avo/types.h> -extern "C" Avo_err *avo_find_run_dir(char **dirp); -#endif - /* * typedefs & structs */ @@ -122,11 +117,6 @@ read_simple_file(register Name makefile_name, register Boolean chase_path, regis register wchar_t *string_end; -#if defined(HP_UX) || defined(linux) - Avo_err *findrundir_err; - char *run_dir, makerules_dir[BUFSIZ]; -#endif - wchar_t * wcb = get_wstring(makefile_name->string_mb); #ifdef NSE @@ -155,51 +145,15 @@ read_simple_file(register Name makefile_name, register Boolean chase_path, regis add_dir_to_path(".", &makefile_path, -1); -#ifdef SUN5_0 - add_dir_to_path(NOCATGETS("/usr/share/lib/make"), - &makefile_path, - -1); - add_dir_to_path(NOCATGETS("/etc/default"), - &makefile_path, - -1); -#elif defined(HP_UX) - findrundir_err = avo_find_run_dir(&run_dir); - if (! findrundir_err) { - (void) sprintf(makerules_dir, NOCATGETS("%s/../share/lib/make"), run_dir); - add_dir_to_path(makerules_dir, - &makefile_path, - -1); - } - - add_dir_to_path(NOCATGETS("/opt/SUNWspro/share/lib/make"), - &makefile_path, - -1); add_dir_to_path(NOCATGETS("/usr/share/lib/make"), &makefile_path, -1); -#elif defined(linux) - findrundir_err = avo_find_run_dir(&run_dir); - if (! findrundir_err) { - (void) sprintf(makerules_dir, NOCATGETS("%s/../lib"), run_dir); - add_dir_to_path(makerules_dir, - &makefile_path, - -1); - } - - add_dir_to_path(NOCATGETS("/usr/SUNWspro/lib"), - &makefile_path, - -1); - add_dir_to_path(NOCATGETS("/opt/SUNWspro/share/lib/make"), - &makefile_path, - -1); - add_dir_to_path(NOCATGETS("/usr/share/lib/make"), + add_dir_to_path(NOCATGETS("/usr/share/sunmake"), &makefile_path, -1); -#else - add_dir_to_path(NOCATGETS("/usr/include/make"), + add_dir_to_path(NOCATGETS("/etc/default"), &makefile_path, -1); -#endif } save_makefile_type = makefile_type; makefile_type = reading_nothing; |