X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh;h=a233db4a8ef44369ffd521b177e5ce2d775d4256;hb=76719d85abaa3a536af862b0aac2307d735e84d8;hp=9d1fca0eaa073dcc34c8feb619101b3d3f948c42;hpb=4fb1f3b2d64a2faa9d961205b1c32f83028172c8;p=debhelper.git

diff --git a/dh b/dh
index 9d1fca0..a233db4 100755
--- a/dh
+++ b/dh
@@ -242,15 +242,8 @@ inhibit_log();
 # make has closed jobserver FDs). In such a case, MAKEFLAGS is cleaned from the
 # offending --jobserver-fds option in order to prevent further make invocations
 # from spitting warnings and disabling job support.
-my ($status, $makeflags) = get_make_jobserver_status();
-if ($status eq "jobserver-unavailable") {
-	# Stop make from spitting pointless job control warnings
-	if (defined $makeflags) {
-		$ENV{MAKEFLAGS} = $makeflags;
-	}
-	else {
-		delete $ENV{MAKEFLAGS};
-	}
+if (is_make_jobserver_unavailable()) {
+	clean_makeflags();
 	# Enable parallel (no maximum) if the package doesn't since it appears this
 	# dh is called via dpkg-buildpackage -jX.
 	$dh{PARALLEL} = 0 if !defined $dh{PARALLEL};