[src/trunk]: src/usr.bin/make Don't apply the suffix (curdir) to MAKEOBJDIR

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

details:   https://anonhg.NetBSD.org/src/rev/ba3c8ff71d5e
branches:  trunk
changeset: 349340:ba3c8ff71d5e
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Dec 07 19:57:09 2016 +0000

description:
Don't apply the suffix (curdir) to MAKEOBJDIR

diffstat:

 usr.bin/make/main.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (54 lines):

diff -r 6347ee0b4ad9 -r ba3c8ff71d5e usr.bin/make/main.c
--- a/usr.bin/make/main.c       Wed Dec 07 18:39:04 2016 +0000
+++ b/usr.bin/make/main.c       Wed Dec 07 19:57:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.252 2016/12/07 15:00:46 christos Exp $      */
+/*     $NetBSD: main.c,v 1.253 2016/12/07 19:57:09 christos Exp $      */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.252 2016/12/07 15:00:46 christos Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.253 2016/12/07 19:57:09 christos Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
@@ -81,7 +81,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.252 2016/12/07 15:00:46 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.253 2016/12/07 19:57:09 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -726,13 +726,13 @@
 }
 
 static Boolean
-Main_SetVarObjdir(const char *var)
+Main_SetVarObjdir(const char *var, const char *suffix)
 {
        char *p1, *path;
        if ((path = Var_Value(var, VAR_CMD, &p1)) == NULL)
                return FALSE;
 
-       (void)Main_SetObjdir("%s%s", path, curdir);
+       (void)Main_SetObjdir("%s%s", path, suffix);
        free(p1);
        return TRUE;
 }
@@ -1120,8 +1120,8 @@
        Dir_Init(curdir);
        (void)Main_SetObjdir("%s", curdir);
 
-       if (!Main_SetVarObjdir("MAKEOBJDIRPREFIX") &&
-           !Main_SetVarObjdir("MAKEOBJDIR") &&
+       if (!Main_SetVarObjdir("MAKEOBJDIRPREFIX", curdir) &&
+           !Main_SetVarObjdir("MAKEOBJDIR", "") &&
            !Main_SetObjdir("%s.%s", _PATH_OBJDIR, machine) &&
            !Main_SetObjdir("%s", _PATH_OBJDIR))
                (void)Main_SetObjdir("%s%s", _PATH_OBJDIRPREFIX, curdir);