summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1997-01-26 12:57:15 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1997-01-26 12:57:15 +0000
commite9c9844eedc232cc66220bfef5fb0779ba3e5aea (patch)
tree7a0594a47e73201a87fa3a331436f1ab33ad82c0 /distrib
parent6f0ec141ea0f1187469b83f33551c527128c3eae (diff)
Even if the objs are cached, we want to find the Makefile
Diffstat (limited to 'distrib')
-rw-r--r--distrib/crunch/crunchgen/crunchgen.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/distrib/crunch/crunchgen/crunchgen.c b/distrib/crunch/crunchgen/crunchgen.c
index b5c4f37db83..c165ad40753 100644
--- a/distrib/crunch/crunchgen/crunchgen.c
+++ b/distrib/crunch/crunchgen/crunchgen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crunchgen.c,v 1.7 1997/01/09 04:09:40 rahnds Exp $ */
+/* $OpenBSD: crunchgen.c,v 1.8 1997/01/26 12:57:14 niklas Exp $ */
/*
* Copyright (c) 1994 University of Maryland
* All Rights Reserved.
@@ -519,14 +519,17 @@ void fillin_program(prog_t *p)
}
}
- /* We have a sourcedir and no explict objs, try */
- /* to find makefile and get objs from it. */
- if (p->srcdir && !p->objs) {
+ /*
+ * We have a sourcedir try to find a makefile and get objs from it,
+ * unless we already have objs cached.
+ */
+ if (p->srcdir) {
for (i = 0; mf_name[i] != NULL; i++) {
sprintf(path, "%s/%s", p->srcdir, mf_name[i]);
if (is_nonempty_file(path)) {
p->mf_name = mf_name[i];
- fillin_program_objs(p, path);
+ if (!p->objs)
+ fillin_program_objs(p, path);
break;
}
}