summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosef Karthauser <joe@FreeBSD.org>2001-08-15 14:37:26 +0000
committerJosef Karthauser <joe@FreeBSD.org>2001-08-15 14:37:26 +0000
commit11384533ea29ae323a8bc22b17b49827e92d400b (patch)
treefea2b80ff4e84be710982fe3ffb3d8c1f2d208b2
parent89a0be2e4f21d09d90c97f0bf134a5d7ec466ba6 (diff)
Notes
-rw-r--r--usr.sbin/crunch/crunchgen/crunchgen.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c
index 2b16894ddbc4..edd752c7bd34 100644
--- a/usr.sbin/crunch/crunchgen/crunchgen.c
+++ b/usr.sbin/crunch/crunchgen/crunchgen.c
@@ -636,7 +636,7 @@ void fillin_program(prog_t *p)
if (!p->objs && p->srcdir && is_nonempty_file(path))
fillin_program_objs(p, path);
- if (!p->srcdir && verbose)
+ if (!p->srcdir && !p->objdir && verbose)
warnx("%s: %s: %s",
"warning: could not find source directory",
infilename, p->name);
@@ -644,7 +644,7 @@ void fillin_program(prog_t *p)
warnx("%s: %s: warning: could not find any .o files",
infilename, p->name);
- if (!p->srcdir || !p->objs)
+ if (!p->objdir || !p->objs)
p->goterror = 1;
}
@@ -962,18 +962,18 @@ void prog_makefile_rules(FILE *outmk, prog_t *p)
fprintf(outmk, "\n# -------- %s\n\n", p->name);
+ fprintf(outmk, "%s_OBJDIR=", p->ident);
+ if (p->objdir)
+ fprintf(outmk, "%s", p->objdir);
+ else
+ fprintf(outmk, "$(MAKEOBJDIRPREFIX)/$(%s_REALSRCDIR)\n",
+ p->ident);
+ fprintf(outmk, "\n");
+
if (p->srcdir && p->objs) {
fprintf(outmk, "%s_SRCDIR=%s\n", p->ident, p->srcdir);
fprintf(outmk, "%s_REALSRCDIR=%s\n", p->ident, p->realsrcdir);
- fprintf(outmk, "%s_OBJDIR=", p->ident);
- if (p->objdir)
- fprintf(outmk, "%s", p->objdir);
- else
- fprintf(outmk, "$(MAKEOBJDIRPREFIX)/$(%s_REALSRCDIR)\n",
- p->ident);
- fprintf(outmk, "\n");
-
fprintf(outmk, "%s_OBJS=", p->ident);
output_strlst(outmk, p->objs);
if (p->buildopts != NULL) {