===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/main.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -c -r1.120 -r1.121
*** src/usr.bin/make/main.c	2016/10/12 00:31:06	1.120
--- src/usr.bin/make/main.c	2016/10/21 16:12:38	1.121
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.120 2016/10/12 00:31:06 tb Exp $ */
  /*	$NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.121 2016/10/21 16:12:38 espie Exp $ */
  /*	$NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $	*/
  
  /*
***************
*** 105,111 ****
  
  static char *chdir_verify_path(const char *, struct dirs *);
  static char *figure_out_CURDIR(void);
! static void setup_CURDIR_OBJDIR(struct dirs *, const char *);
  
  static void setup_VPATH(void);
  
--- 105,111 ----
  
  static char *chdir_verify_path(const char *, struct dirs *);
  static char *figure_out_CURDIR(void);
! static void setup_CURDIR_OBJDIR(struct dirs *);
  
  static void setup_VPATH(void);
  
***************
*** 544,550 ****
  }
  
  static void
! setup_CURDIR_OBJDIR(struct dirs *d, const char *machine)
  {
  	char *path;
  
--- 544,550 ----
  }
  
  static void
! setup_CURDIR_OBJDIR(struct dirs *d)
  {
  	char *path;
  
***************
*** 656,662 ****
  	bool read_depend = true;/* false if we don't want to read .depend */
  
  	MainParseChdir(argc, argv);
! 	setup_CURDIR_OBJDIR(&d, machine);
  
  	esetenv("PWD", d.object);
  	unsetenv("CDPATH");
--- 656,662 ----
  	bool read_depend = true;/* false if we don't want to read .depend */
  
  	MainParseChdir(argc, argv);
! 	setup_CURDIR_OBJDIR(&d);
  
  	esetenv("PWD", d.object);
  	unsetenv("CDPATH");
***************
*** 736,742 ****
  		LstNode ln;
  
  		for (ln = Lst_First(create); ln != NULL; ln = Lst_Adv(ln)) {
! 			char *name = (char *)Lst_Datum(ln);
  
  			if (strcmp(name, "depend") == 0)
  				read_depend = false;
--- 736,742 ----
  		LstNode ln;
  
  		for (ln = Lst_First(create); ln != NULL; ln = Lst_Adv(ln)) {
! 			char *name = Lst_Datum(ln);
  
  			if (strcmp(name, "depend") == 0)
  				read_depend = false;
***************
*** 782,788 ****
  
  		for (ln = Lst_First(&varstoprint); ln != NULL;
  		    ln = Lst_Adv(ln)) {
! 			char *value = Var_Value((char *)Lst_Datum(ln));
  
  			printf("%s\n", value ? value : "");
  		}
--- 782,788 ----
  
  		for (ln = Lst_First(&varstoprint); ln != NULL;
  		    ln = Lst_Adv(ln)) {
! 			char *value = Var_Value(Lst_Datum(ln));
  
  			printf("%s\n", value ? value : "");
  		}