X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh;h=bd82d44bd4760e6870618cfa9f99b45c754866a2;hb=725a4d769be1573cca18ced3581a55ef906235ff;hp=710117ead15d9db779a913b4068118e3322a2367;hpb=d64e9b242a1c3c9b35f006eec048a3cf683fc925;p=debhelper.git

diff --git a/dh b/dh
index 710117e..bd82d44 100755
--- a/dh
+++ b/dh
@@ -225,6 +225,13 @@ init(options => {
 });
 inhibit_log();
 
+# If make is using a jobserver, but it is not available
+# to this process, clean out MAKEFLAGS. This avoids
+# ugly warnings when calling make.
+if (is_make_jobserver_unavailable()) {
+	clean_jobserver_makeflags();
+}
+
 # Definitions of sequences.
 my %sequences;
 $sequences{build} = [qw{
@@ -253,7 +260,6 @@ $sequences{install} = [@{$sequences{build}}, qw{
 	dh_installcatalogs
 	dh_installcron
 	dh_installdebconf
-	dh_installcatalogs
 	dh_installemacsen
 	dh_installifupdown
 	dh_installinfo