From: Mark Andrews <marka@isc.org>
Date: Fri, 2 Dec 2011 07:06:31 +0000 (+0000)
Subject: 3234.   [bug]           'make depend' produced invalid makefiles. [RT #26830]
X-Git-Tag: v9.7.5b1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93b52e00f91ab5032572bef8ba9dbca815eeffab;p=thirdparty%2Fbind9.git

3234.   [bug]           'make depend' produced invalid makefiles. [RT #26830]
---

diff --git a/CHANGES b/CHANGES
index 2f565f81499..6f4e265ed52 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3234.	[bug]		'make depend' produced invalid makefiles. [RT #26830]
+
 3231.	[bug]		named could fail to send a uncompressable zone.
 			[RT #26796]
 
diff --git a/make/mkdep.in b/make/mkdep.in
index bb536c95968..8c2201f462c 100644
--- a/make/mkdep.in
+++ b/make/mkdep.in
@@ -140,25 +140,37 @@ if [ X"${MKDEPPROG}" != X ]; then
 else
     @MKDEPCC@ @MKDEPCFLAGS@ ${newargs} |
     sed "
-	s; \./; ;g
+	s; \\./; ;g
+	s; \\\\; ;g
 	@LIBTOOL_MKDEP_SED@
 	$SED" |
-    awk '{
-	if ($1 != prev) {
+    awk '$1 ~ /:$/ {
 		if (rec != "")
-			print rec;
-		rec = $0;
-		prev = $1;
+			 print rec;
+		if (NF == 1)
+			rec = $1;
+		else
+			rec = $1 " " $2;
+		for (i = 3; i <= NF; i++) {
+			if (length(rec $i) > 76) {
+				print rec " \\";
+				rec = "    " $i;
+			} else {
+				rec = rec " " $i;
+			}
+		}
+		next;
 	}
-	else {
-		if (length(rec $2) > 78) {
-			print rec;
-			rec = $0;
+	{
+		for (i = 1; i <= NF; i++) {
+			if (length(rec $i) > 76) {
+				print rec, "\\";
+				rec =  "    " $i;
+			} else {
+				rec = rec " " $i;
+			}
 		}
-		else
-			rec = rec " " $2
 	}
-    }
     END {
 	print rec
     }' >> $TMP