summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>1993-11-03 11:56:26 +0000
committerRoland McGrath <roland@redhat.com>1993-11-03 11:56:26 +0000
commit4394c7a32d944c58f9c9c2ebe91fe1ea3953f20e (patch)
treee358522cf1225398db7c3ded1eccdfd463905eec
parent38abf5e6c456811d752365ef3aa67a85b51e0160 (diff)
downloadgunmake-4394c7a32d944c58f9c9c2ebe91fe1ea3953f20e.tar.gz
entered into RCS
-rw-r--r--implicit.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/implicit.c b/implicit.c
index 1c308dd..64cf1a3 100644
--- a/implicit.c
+++ b/implicit.c
@@ -36,6 +36,14 @@ try_implicit_rule (file, depth)
{
DEBUGPR ("Looking for an implicit rule for `%s'.\n");
+ /* The order of these searches was previously reversed. My logic now is
+ that since the non-archive search uses more information in the target
+ (the archive search omits the archive name), it is more specific and
+ should come first. */
+
+ if (pattern_search (file, 0, depth, 0))
+ return 1;
+
#ifndef NO_ARCHIVES
/* If this is an archive member reference, use just the
archive member name to search for implicit rules. */
@@ -47,7 +55,7 @@ try_implicit_rule (file, depth)
}
#endif
- return pattern_search (file, 0, depth, 0);
+ return 0;
}
#define DEBUGP2(msg, a1, a2) \