[src/trunk]: src/usr.bin/crunch/crunchgen Change the make(1) command lines ge...

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

details:   https://anonhg.NetBSD.org/src/rev/c533efca89b0
branches:  trunk
changeset: 555514:c533efca89b0
user:      nathanw <nathanw%NetBSD.org@localhost>
date:      Wed Nov 19 22:44:15 2003 +0000

description:
Change the make(1) command lines generated by crunchgen from:

"make -a -b VAR=VALUE -c -d target" to
"make -a -b -c -d VAR=VALUE target"

to avoid depending on make's undocumented and unportably-implemented
handling of the former case.

Makes crunchgen and nbmake work together on Cygwin.

diffstat:

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

diffs (36 lines):

diff -r 4cbf3abc9e14 -r c533efca89b0 usr.bin/crunch/crunchgen/crunchgen.c
--- a/usr.bin/crunch/crunchgen/crunchgen.c      Wed Nov 19 22:40:55 2003 +0000
+++ b/usr.bin/crunch/crunchgen/crunchgen.c      Wed Nov 19 22:44:15 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: crunchgen.c,v 1.51 2003/10/27 00:12:43 lukem Exp $     */
+/*     $NetBSD: crunchgen.c,v 1.52 2003/11/19 22:44:15 nathanw Exp $   */
 /*
  * Copyright (c) 1994 University of Maryland
  * All Rights Reserved.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: crunchgen.c,v 1.51 2003/10/27 00:12:43 lukem Exp $");
+__RCSID("$NetBSD: crunchgen.c,v 1.52 2003/11/19 22:44:15 nathanw Exp $");
 #endif
 
 #include <stdlib.h>
@@ -629,7 +629,7 @@
     fclose(f);
 
     (void)snprintf(line, sizeof(line),
-       "cd %s && %s -B CRUNCHEDPROG=1 -f %s %s crunchgen_objs 2>&1", dirpath,
+       "cd %s && %s -B -f %s %s CRUNCHEDPROG=1 crunchgen_objs 2>&1", dirpath,
        makebin, tempfname, makeflags);
     if((f = popen(line, "r")) == NULL) {
        perror("submake pipe");
@@ -898,7 +898,7 @@
            p->ident, p->ident, p->ident);
        fprintf(outmk, "\tprintf \".PATH: ${%s_SRCDIR}\\n.CURDIR:= ${%s_SRCDIR}\\n"
            ".include \\\"\\$${.CURDIR}/Makefile\\\"\\n\" \\\n", p->ident, p->ident);
-       fprintf(outmk, "\t| ${MAKE} CRUNCHEDPROG=1 DBG=\"${DBG}\" -f- depend ${%s_OBJS}\n\n",
+       fprintf(outmk, "\t| ${MAKE} -f- CRUNCHEDPROG=1 DBG=\"${DBG}\" depend ${%s_OBJS}\n\n",
            p->ident);
     }
     else