From 07aff032b904478dc7c428ee71c5bf8b01a0c6ab Mon Sep 17 00:00:00 2001 From: espie Date: Tue, 10 Jul 2012 22:59:06 +0000 Subject: [PATCH] avoid barfing if run into a directory whose parent contains a Makefile.inc --- infrastructure/lib/DPB/Vars.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/infrastructure/lib/DPB/Vars.pm b/infrastructure/lib/DPB/Vars.pm index 871fe347901..f6865046bce 100644 --- a/infrastructure/lib/DPB/Vars.pm +++ b/infrastructure/lib/DPB/Vars.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Vars.pm,v 1.27 2012/07/04 08:59:10 espie Exp $ +# $OpenBSD: Vars.pm,v 1.28 2012/07/10 22:59:06 espie Exp $ # # Copyright (c) 2010 Marc Espie # @@ -63,6 +63,7 @@ PERMIT_DISTFILES_CDROM=Yes PERMIT_DISTFILES_FTP=Yes WRKOBJDIR= IGNORE=Yes +_MAKEFILE_INC_DONE=Yes ECHO_MSG=: .include EOT @@ -80,6 +81,7 @@ EOT waitpid($pid, 0); } else { close STDIN; + chdir('/'); open(STDIN, '<&', $rh); exec {$make} ('make', '-f', '-'); die "oops couldn't exec $make";