Print this page
make: unifdef SUN5_0 (defined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/read.cc
          +++ new/usr/src/cmd/make/bin/read.cc
↓ open down ↓ 142 lines elided ↑ open up ↑
 143  143          makefile->body.makefile.contents = NULL;
 144  144          makefile->body.makefile.size = 0;
 145  145          if ((makefile_name->hash.length != 1) ||
 146  146              (wcb[0] != (int) hyphen_char)) {
 147  147                  if ((makefile->body.makefile.contents == NULL) &&
 148  148                      (doname_it)) {
 149  149                          if (makefile_path == NULL) {
 150  150                                  add_dir_to_path(".",
 151  151                                                  &makefile_path,
 152  152                                                  -1);
 153      -#ifdef SUN5_0
 154  153                                  add_dir_to_path(NOCATGETS("/usr/share/lib/make"),
 155  154                                                  &makefile_path,
 156  155                                                  -1);
 157  156                                  add_dir_to_path(NOCATGETS("/etc/default"),
 158  157                                                  &makefile_path,
 159  158                                                  -1);
 160      -#elif defined(HP_UX)
 161      -                                findrundir_err = avo_find_run_dir(&run_dir);
 162      -                                if (! findrundir_err) {
 163      -                                        (void) sprintf(makerules_dir, NOCATGETS("%s/../share/lib/make"), run_dir);
 164      -                                        add_dir_to_path(makerules_dir,
 165      -                                                        &makefile_path,
 166      -                                                        -1);
 167      -                                }
 168      -
 169      -                                add_dir_to_path(NOCATGETS("/opt/SUNWspro/share/lib/make"),
 170      -                                                &makefile_path,
 171      -                                                -1);
 172      -                                add_dir_to_path(NOCATGETS("/usr/share/lib/make"),
 173      -                                                &makefile_path,
 174      -                                                -1);
 175      -#elif defined(linux)
 176      -                                findrundir_err = avo_find_run_dir(&run_dir);
 177      -                                if (! findrundir_err) {
 178      -                                        (void) sprintf(makerules_dir, NOCATGETS("%s/../lib"), run_dir);
 179      -                                        add_dir_to_path(makerules_dir,
 180      -                                                        &makefile_path,
 181      -                                                        -1);
 182      -                                }
 183      -
 184      -                                add_dir_to_path(NOCATGETS("/usr/SUNWspro/lib"),
 185      -                                                &makefile_path,
 186      -                                                -1);
 187      -                                add_dir_to_path(NOCATGETS("/opt/SUNWspro/share/lib/make"),
 188      -                                                &makefile_path,
 189      -                                                -1);
 190      -                                add_dir_to_path(NOCATGETS("/usr/share/lib/make"),
 191      -                                                &makefile_path,
 192      -                                                -1);
 193      -#else
 194      -                                add_dir_to_path(NOCATGETS("/usr/include/make"),
 195      -                                                &makefile_path,
 196      -                                                -1);
 197      -#endif
 198  159                          }
 199  160                          save_makefile_type = makefile_type;
 200  161                          makefile_type = reading_nothing;
 201  162                          if (doname(makefile_name, true, false) == build_dont_know) {
 202  163                                  /* Try normalized filename */
 203  164                                  string_start=get_wstring(makefile_name->string_mb);
 204  165                                  for (string_end=string_start+1; *string_end != L'\0'; string_end++);
 205  166                                  normalized_makefile_name=normalize_name(string_start, string_end - string_start);
 206  167                                  if ((strcmp(makefile_name->string_mb, normalized_makefile_name->string_mb) == 0) || 
 207  168                                          (doname(normalized_makefile_name, true, false) == build_dont_know)) {
↓ open down ↓ 1985 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX