summaryrefslogtreecommitdiff
path: root/usr.bin/make
diff options
context:
space:
mode:
authorsjg <sjg@NetBSD.org>2000-05-10 07:49:35 +0000
committersjg <sjg@NetBSD.org>2000-05-10 07:49:35 +0000
commit82abb388a668e579ea2c638f4eb810aa7ea38bb6 (patch)
tree704e33483eebe9e4f9b9e807b8b82555aa1009d0 /usr.bin/make
parent659b78955d8f7e6af4068ae2144ad4b5bb1894de (diff)
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 (limited to 'usr.bin/make')
-rw-r--r--usr.bin/make/main.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index d5c769cbf19..6df87a52f09 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\n\
#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 ignoreErrors; /* -i flag */
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 @@ rearg: while((c = getopt(argc, argv, OPTFLAGS)) != -1) {
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 @@ main(argc, argv)
* 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