 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.230 2018/12/17 02:06:00 christos Exp $	*/
+/*	$NetBSD: parse.c,v 1.231 2018/12/22 00:36:32 sjg Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.230 2018/12/17 02:06:00 christos Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.231 2018/12/22 00:36:32 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)parse.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: parse.c,v 1.230 2018/12/17 02:06:00 christos Exp $");
+__RCSID("$NetBSD: parse.c,v 1.231 2018/12/22 00:36:32 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * parse.c --
  *	Functions to parse a makefile.
+ *
  *	One function, Parse_Init, must be called before any functions
  *	in this module are used. After that, the function Parse_File is the
  *	main entry point and controls most of the other functions in this
  *	module.
+ *
 @@ -666,41 +666,52 @@ ParseFindKeyword(const char *str)
  */
 /* VARARGS */
 static void
 ParseVErrorInternal(FILE *f, const char *cfname, size_t clineno, int type,
     const char *fmt, va_list ap)
+{
 	static Boolean fatal_warning_error_printed = FALSE;
 	(void)fprintf(f, "%s: ", progname);
 	if (cfname != NULL) {
 		(void)fprintf(f, "\"");
 		if (*cfname != '/' && strcmp(cfname, "(stdin)") != 0) {
-			char *cp;
+			char *cp, *cp2;
-			const char *dir;
+			const char *dir, *fname;
 			/*
 			 * Nothing is more annoying than not knowing
 			 * which Makefile is the culprit; we try ${.PARSEDIR}
-			 * first and if that's not absolute, we try ${.CURDIR}
+			 * and apply realpath(3) if not absolute.
 			 */
 			dir = Var_Value(".PARSEDIR", VAR_GLOBAL, &cp);
 			if (dir == NULL || *dir == '\0' || *dir != '/')
 				dir = Var_Value(".CURDIR", VAR_GLOBAL, &cp);
 			if (dir == NULL)
 				dir = ".";
 			if (*dir != '/') {
-			(void)fprintf(f, "%s/%s", dir, cfname);
+				dir = cp2 = realpath(dir, NULL);
 				free(cp);
 				cp = cp2; /* cp2 set to NULL by Var_Value */
+			}
 			fname = Var_Value(".PARSEFILE", VAR_GLOBAL, &cp2);
 			if (fname == NULL) {
 				if ((fname = strrchr(cfname, '/')))
 					fname++;
 				else
 					fname = cfname;
+			}
 			(void)fprintf(f, "%s/%s", dir, fname);
 			free(cp2);
 			free(cp);
 		} else
 			(void)fprintf(f, "%s", cfname);
 		(void)fprintf(f, "\" line %d: ", (int)clineno);
+	}
 	if (type == PARSE_WARNING)
 		(void)fprintf(f, "warning: ");
 	(void)vfprintf(f, fmt, ap);
 	(void)fprintf(f, "\n");
 	(void)fflush(f);
 	if (type == PARSE_INFO)
 		return;
 	if (type == PARSE_FATAL || parseWarnFatal)