Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
sommerfeld 2000-01-09 16:37:28 +00:00
parent 959b8807ca
commit dd51978a5a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/crunch/crunchgen/crunchgen.c
View File

@ -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 * Copyright (c) 1994 University of Maryland
* All Rights Reserved. * All Rights Reserved.
@ -33,7 +33,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #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 #endif
#include <stdlib.h> #include <stdlib.h>
@ -516,11 +516,11 @@ void fillin_program(prog_t *p)
} }
} }
if(!p->objdir && p->srcdir) { 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)) if(is_dir(path))
p->objdir = strdup(path); p->objdir = strdup(path);
else { 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)) if(is_dir(path))
p->objdir = strdup(path); p->objdir = strdup(path);
else else