Print this page
make: unifdef for MAKETOOL and DISTRIBUTED (undefined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/read2.cc
          +++ new/usr/src/cmd/make/bin/read2.cc
↓ open down ↓ 1863 lines elided ↑ open up ↑
1864 1864                  } else {
1865 1865                          (void) sprintf(message,
1866 1866                                         "%s: %s",
1867 1867                                         mbs_buffer,
1868 1868                                         pattern);
1869 1869                  }
1870 1870                  pattern = message;
1871 1871          }
1872 1872  
1873 1873          (void) fflush(stdout);
1874      -#ifdef DISTRIBUTED
1875      -        (void) fprintf(stderr, catgets(catd, 1, 113, "dmake: Fatal error in reader: "));
1876      -#else
1877 1874          (void) fprintf(stderr, catgets(catd, 1, 238, "make: Fatal error in reader: "));
1878      -#endif
1879 1875          (void) vfprintf(stderr, pattern, args);
1880 1876          (void) fprintf(stderr, "\n");
1881 1877          va_end(args);
1882 1878  
1883 1879          if (temp_file_name != NULL) {
1884 1880                  (void) fprintf(stderr,
1885      -#ifdef DISTRIBUTED
1886      -                               catgets(catd, 1, 114, "dmake: Temp-file %s not removed\n"),
1887      -#else
1888 1881                                 catgets(catd, 1, 239, "make: Temp-file %s not removed\n"),
1889      -#endif
1890 1882                                 temp_file_name->string_mb);
1891 1883                  temp_file_name = NULL;
1892 1884          }
1893 1885  
1894 1886          if (report_pwd) {
1895 1887                  (void) fprintf(stderr,
1896 1888                                 catgets(catd, 1, 115, "Current working directory %s\n"),
1897 1889                                 get_current_path());
1898 1890          }
1899 1891          (void) fflush(stderr);
1900 1892          exit_status = 1;
1901 1893          exit(1);
1902 1894  }
1903 1895  
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX