===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/main.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- src/usr.bin/make/main.c	2012/10/09 19:47:09	1.99
+++ src/usr.bin/make/main.c	2012/10/18 17:54:43	1.100
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.99 2012/10/09 19:47:09 espie Exp $ */
+/*	$OpenBSD: main.c,v 1.100 2012/10/18 17:54:43 espie Exp $ */
 /*	$NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $	*/
 
 /*
@@ -124,9 +124,10 @@
 static void read_makefile_list(Lst, struct dirs *);
 static int ReadMakefile(void *, void *);
 
-static void record_option(int c, const char *arg)
+static void
+record_option(int c, const char *arg)
 {
-    char opt[3];
+    	char opt[3];
 
 	opt[0] = '-';
 	opt[1] = c;
@@ -724,6 +725,10 @@
 	 * First snag any flags out of the MAKEFLAGS environment variable.
 	 */
 	Main_ParseArgLine(getenv("MAKEFLAGS"));
+	
+	basedirectory = getenv("MAKEBASEDIRECTORY");
+	if (basedirectory == NULL)
+		setenv("MAKEBASEDIRECTORY", d.current, 0);
 
 	MainParseArgs(argc, argv);