Print this page
make: prefix errors and such with the right command name
*** 1498,1508 ****
svr4 = true;
return 0;
case 'v': /* Version flag */
if (invert_this) {
} else {
! fprintf(stdout, "dmake: %s\n", verstring);
exit_status = 0;
exit(0);
}
return 0;
case 'w': /* Unconditional flag */
--- 1498,1508 ----
svr4 = true;
return 0;
case 'v': /* Version flag */
if (invert_this) {
} else {
! fprintf(stdout, "%s: %s\n", getprogname(), verstring);
exit_status = 0;
exit(0);
}
return 0;
case 'w': /* Unconditional flag */
*** 3185,3211 ****
putenv(mlev);
if(report_cwd) {
if(make_level_val <= 0) {
if(entering) {
! sprintf( rcwd
! , gettext("dmake: Entering directory `%s'\n")
! , get_current_path());
! } else {
! sprintf( rcwd
! , gettext("dmake: Leaving directory `%s'\n")
! , get_current_path());
}
} else {
if(entering) {
! sprintf( rcwd
! , gettext("dmake[%d]: Entering directory `%s'\n")
! , make_level_val, get_current_path());
! } else {
! sprintf( rcwd
! , gettext("dmake[%d]: Leaving directory `%s'\n")
! , make_level_val, get_current_path());
}
}
printf("%s", rcwd);
}
}
--- 3185,3215 ----
putenv(mlev);
if(report_cwd) {
if(make_level_val <= 0) {
if(entering) {
! sprintf(rcwd,
! gettext("%s: Entering directory `%s'\n"),
! getprogname(),
! get_current_path());
! } else {
! sprintf(rcwd,
! gettext("%s: Leaving directory `%s'\n"),
! getprogname(),
! get_current_path());
}
} else {
if(entering) {
! sprintf(rcwd,
! gettext("%s[%d]: Entering directory `%s'\n"),
! getprogname(),
! make_level_val, get_current_path());
! } else {
! sprintf(rcwd,
! gettext("%s[%d]: Leaving directory `%s'\n"),
! getprogname(),
! make_level_val, get_current_path());
}
}
printf("%s", rcwd);
}
}