[src/trunk]: src/usr.bin/make Revert to the original behaviour wrt sysIncPath...

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

details:   https://anonhg.NetBSD.org/src/rev/bf7f9dfa37ab
branches:  trunk
changeset: 485978:bf7f9dfa37ab
user:      sjg <sjg%NetBSD.org@localhost>
date:      Wed May 10 07:49:35 2000 +0000

description:
Revert to the original behaviour wrt sysIncPath, ie if sysIncPath
is an empty list, use DEFSYSPATH.
The current behaviour may have been useful when DEFSYSMK was an
absolute path (hasn't been the case since 1996), but right now
make -m /no/such/dir will fail to find sys.mk and die.

diffstat:

 usr.bin/make/main.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r cc7c2fd8d911 -r bf7f9dfa37ab usr.bin/make/main.c
--- a/usr.bin/make/main.c       Wed May 10 05:09:17 2000 +0000
+++ b/usr.bin/make/main.c       Wed May 10 07:49:35 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.55 2000/04/29 12:15:16 sjg Exp $    */
+/*     $NetBSD: main.c,v 1.56 2000/05/10 07:49:35 sjg Exp $    */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -39,7 +39,7 @@
  */
 
 #ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: main.c,v 1.55 2000/04/29 12:15:16 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.56 2000/05/10 07:49:35 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
@@ -51,7 +51,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.55 2000/04/29 12:15:16 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.56 2000/05/10 07:49:35 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -137,7 +137,6 @@
 Boolean                        beSilent;       /* -s flag */
 Boolean                        oldVars;        /* variable substitution style */
 Boolean                        checkEnvFirst;  /* -e flag */
-Boolean                        mkIncPath;      /* -m flag */
 static Boolean         jobsRunning;    /* TRUE if the jobs might be running */
 
 static char *          Check_Cwd_av __P((int, char **, int));
@@ -303,7 +302,6 @@
                        Var_Append(MAKEFLAGS, "-k", VAR_GLOBAL);
                        break;
                case 'm':
-                       mkIncPath = TRUE;
                        (void) Dir_AddDir(sysIncPath, optarg);
                        Var_Append(MAKEFLAGS, "-m", VAR_GLOBAL);
                        Var_Append(MAKEFLAGS, optarg, VAR_GLOBAL);
@@ -711,7 +709,7 @@
         * add the directories from the DEFSYSPATH (more than one may be given
         * as dir1:...:dirn) to the system include path.
         */
-       if (!mkIncPath) {
+       if (Lst_IsEmpty(sysIncPath)) {
                if (syspath == NULL || *syspath == '\0')
                        syspath = defsyspath;
                else