From 74a19f122947157cf2b9cb752f084f3475b9173f Mon Sep 17 00:00:00 2001 From: Steve Passe Date: Thu, 14 Aug 1997 04:46:20 +0000 Subject: [PATCH] Fix PR bin/4291: /usr/bin/make - inconsistent -j flag parsing. Submitted by: N.Dudorov --- usr.bin/make/main.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index dfe0c43d15c..92b3de9d49c 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -47,7 +47,7 @@ static const char copyright[] = static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #endif static const char rcsid[] = - "$Id$"; + "$Id: main.c,v 1.18 1997/07/24 06:58:06 charnier Exp $"; #endif /* not lint */ /*- @@ -315,13 +315,6 @@ rearg: while((c = getopt(argc, argv, OPTFLAGS)) != -1) { } } - /* - * Be compatible if user did not specify -j and did not explicitly - * turned compatibility on - */ - if (!compatMake && !forceJobs) - compatMake = TRUE; - oldVars = TRUE; /* @@ -344,6 +337,13 @@ rearg: while((c = getopt(argc, argv, OPTFLAGS)) != -1) { } (void)Lst_AtEnd(create, (ClientData)estrdup(*argv)); } + + /* + * Be compatible if user did not specify -j and did not explicitly + * turned compatibility on + */ + if (!compatMake && !forceJobs) + compatMake = TRUE; } /*-