[src/trunk]: src/usr.bin/crunch/crunchgen Make rules for finding object direc...

[sommerfeld <sommerfeld%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f33d9274555b
branches:  trunk
changeset: 480335:f33d9274555b
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Sun Jan 09 16:37:28 2000 +0000

description:
Make rules for finding object directory match those used by make:
obj.${MACHINE} takes precedence over obj.
the generated makefile should probably just use the print-objdir hack instead.

diffstat:

 usr.bin/crunch/crunchgen/crunchgen.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 6faff00c6a7b -r f33d9274555b usr.bin/crunch/crunchgen/crunchgen.c
--- a/usr.bin/crunch/crunchgen/crunchgen.c      Sun Jan 09 16:14:04 2000 +0000
+++ b/usr.bin/crunch/crunchgen/crunchgen.c      Sun Jan 09 16:37:28 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: crunchgen.c,v 1.12 2000/01/09 04:54:53 tsutsui Exp $   */
+/*     $NetBSD: crunchgen.c,v 1.13 2000/01/09 16:37:28 sommerfeld Exp $        */
 /*
  * Copyright (c) 1994 University of Maryland
  * All Rights Reserved.
@@ -33,7 +33,7 @@
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: crunchgen.c,v 1.12 2000/01/09 04:54:53 tsutsui Exp $");
+__RCSID("$NetBSD: crunchgen.c,v 1.13 2000/01/09 16:37:28 sommerfeld Exp $");
 #endif
 
 #include <stdlib.h>
@@ -516,11 +516,11 @@
        }
     }
     if(!p->objdir && p->srcdir) {
-       (void)snprintf(path, sizeof(path), "%s/obj", p->srcdir);
+       (void)snprintf(path, sizeof(path), "%s/obj.%s", p->srcdir, machine);
        if(is_dir(path))
            p->objdir = strdup(path);
        else {
-           (void)snprintf(path, sizeof(path), "%s/obj.%s", p->srcdir, machine);
+           (void)snprintf(path, sizeof(path), "%s/obj", p->srcdir);
            if(is_dir(path))
                p->objdir = strdup(path);
            else